From 04b61bda0ef4f144cc75010234f362e801fb09f1 Mon Sep 17 00:00:00 2001
From: James Deathe <james.deathe@gmail.com>
Date: Wed, 17 Jul 2019 20:36:49 +0100
Subject: [PATCH] #174: Updates Apache configuration to use DSO Module
 identifiers.

---
 CHANGELOG.md                                        | 1 +
 src/etc/httpd/conf.d/00-deflate.conf                | 6 +++---
 src/etc/httpd/conf.d/00-expires.conf                | 2 +-
 src/etc/httpd/conf.d/00-headers.conf                | 2 +-
 src/etc/httpd/conf.d/00-mime-type.conf              | 2 +-
 src/etc/httpd/conf.d/00-php-operating-mode.conf     | 2 +-
 src/etc/httpd/conf.d/00-reqtimeout.conf             | 2 +-
 src/etc/httpd/conf.d/10-name-virtual-host.conf      | 2 +-
 src/etc/httpd/conf.d/10-virtual-host-encrypted.conf | 2 +-
 src/etc/httpd/conf.virtualhost.d/00-log.conf        | 4 ++--
 src/etc/httpd/conf.virtualhost.d/00-rewrite.conf    | 2 +-
 test/shpec/operation_shpec.sh                       | 4 ++--
 12 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2471f6..527feab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ CentOS-7 7.5.1804 x86_64, Apache 2.4, PHP-CGI 5.4 (FastCGI), PHP memcached 2.2,
 - Updates description in centos-ssh-apache-php-fcgi.register@.service.
 - Updates Dockerfile `org.deathe.description` metadata LABEL to include PHP redis module.
 - Removes unused `DOCKER_PORT_MAP_TCP_22` variable from environment includes.
+- Updates Apache configuration to use DSO Module identifiers for consistency.
 
 ### 2.1.0 - 2019-04-14
 
diff --git a/src/etc/httpd/conf.d/00-deflate.conf b/src/etc/httpd/conf.d/00-deflate.conf
index 4eb118d..dac92d2 100644
--- a/src/etc/httpd/conf.d/00-deflate.conf
+++ b/src/etc/httpd/conf.d/00-deflate.conf
@@ -1,7 +1,7 @@
-<IfModule mod_deflate.c>
+<IfModule deflate_module>
     # Identify known cases of invalidated Accept-Encoding request headers.
-    <IfModule mod_setenvif.c>
-        <IfModule mod_headers.c>
+    <IfModule setenvif_module>
+        <IfModule headers_module>
             SetEnvIfNoCase \
                 ^(Accept-EncodXng|X-cept-Encoding|[X~-]{15})$ \
                 ^((gzip|deflate)\s*,?\s*)+|[X~-]{4,13}$ \
diff --git a/src/etc/httpd/conf.d/00-expires.conf b/src/etc/httpd/conf.d/00-expires.conf
index 4e50751..24d89c3 100644
--- a/src/etc/httpd/conf.d/00-expires.conf
+++ b/src/etc/httpd/conf.d/00-expires.conf
@@ -1,4 +1,4 @@
-<IfModule mod_expires.c>
+<IfModule expires_module>
     ExpiresActive On
     ExpiresByType application/font-woff A604800
     ExpiresByType application/font-woff2 A604800
diff --git a/src/etc/httpd/conf.d/00-headers.conf b/src/etc/httpd/conf.d/00-headers.conf
index 1e107f5..224c72d 100644
--- a/src/etc/httpd/conf.d/00-headers.conf
+++ b/src/etc/httpd/conf.d/00-headers.conf
@@ -1,4 +1,4 @@
-<IfModule mod_headers.c>
+<IfModule headers_module>
     RequestHeader unset Proxy early
     Header unset X-Service-Operating-Mode
     <IfDefine development>
diff --git a/src/etc/httpd/conf.d/00-mime-type.conf b/src/etc/httpd/conf.d/00-mime-type.conf
index e376fd6..f4d27aa 100644
--- a/src/etc/httpd/conf.d/00-mime-type.conf
+++ b/src/etc/httpd/conf.d/00-mime-type.conf
@@ -1,4 +1,4 @@
-<IfModule mod_mime.c>
+<IfModule mime_module>
     AddEncoding gzip svgz
     AddType application/font-woff woff
     AddType application/font-woff2 woff2
diff --git a/src/etc/httpd/conf.d/00-php-operating-mode.conf b/src/etc/httpd/conf.d/00-php-operating-mode.conf
index ef67ef5..aa100fd 100644
--- a/src/etc/httpd/conf.d/00-php-operating-mode.conf
+++ b/src/etc/httpd/conf.d/00-php-operating-mode.conf
@@ -1,4 +1,4 @@
-<IfModule mod_php5.c>
+<IfModule php5_module>
     # Operating mode is production default
     <IfDefine !production>
         php_value error_reporting 32767
diff --git a/src/etc/httpd/conf.d/00-reqtimeout.conf b/src/etc/httpd/conf.d/00-reqtimeout.conf
index b95b0a1..46c0255 100644
--- a/src/etc/httpd/conf.d/00-reqtimeout.conf
+++ b/src/etc/httpd/conf.d/00-reqtimeout.conf
@@ -1,3 +1,3 @@
-<IfModule mod_reqtimeout.c>
+<IfModule reqtimeout_module>
     RequestReadTimeout header=20-40,MinRate=500 body=20,MinRate=500
 </IfModule>
diff --git a/src/etc/httpd/conf.d/10-name-virtual-host.conf b/src/etc/httpd/conf.d/10-name-virtual-host.conf
index 12f9831..e57833f 100644
--- a/src/etc/httpd/conf.d/10-name-virtual-host.conf
+++ b/src/etc/httpd/conf.d/10-name-virtual-host.conf
@@ -1,7 +1,7 @@
 <IfVersion < 2.4>
     NameVirtualHost *:80
     NameVirtualHost *:8443
-    <IfModule mod_ssl.c>
+    <IfModule ssl_module>
         NameVirtualHost *:443
     </IfModule>
 </IfVersion>
diff --git a/src/etc/httpd/conf.d/10-virtual-host-encrypted.conf b/src/etc/httpd/conf.d/10-virtual-host-encrypted.conf
index a1f5994..933b51b 100644
--- a/src/etc/httpd/conf.d/10-virtual-host-encrypted.conf
+++ b/src/etc/httpd/conf.d/10-virtual-host-encrypted.conf
@@ -1,4 +1,4 @@
-<IfModule mod_ssl.c>
+<IfModule ssl_module>
     <VirtualHost *:443>
         Include conf.virtualhost.d/*.conf
 
diff --git a/src/etc/httpd/conf.virtualhost.d/00-log.conf b/src/etc/httpd/conf.virtualhost.d/00-log.conf
index 4ad474d..4d3130b 100644
--- a/src/etc/httpd/conf.virtualhost.d/00-log.conf
+++ b/src/etc/httpd/conf.virtualhost.d/00-log.conf
@@ -1,9 +1,9 @@
 ErrorLog "${APACHE_ERROR_LOG_LOCATION}"
 LogLevel "${APACHE_ERROR_LOG_LEVEL}"
-<IfModule mod_log_config.c>
+<IfModule log_config_module>
     CustomLog "${APACHE_CUSTOM_LOG_LOCATION}" "${APACHE_CUSTOM_LOG_FORMAT}" env=!SKIP_CUSTOM_LOG
 </IfModule>
-<IfModule mod_setenvif.c>
+<IfModule setenvif_module>
     <IfVersion < 2.4>
         SetEnvIf Request_Method ".*" TRUSTED_ADDRESS=false
         SetEnvIf Remote_Addr "^127\.0\.0\.1$" TRUSTED_ADDRESS=true
diff --git a/src/etc/httpd/conf.virtualhost.d/00-rewrite.conf b/src/etc/httpd/conf.virtualhost.d/00-rewrite.conf
index f1d444e..685e9a5 100644
--- a/src/etc/httpd/conf.virtualhost.d/00-rewrite.conf
+++ b/src/etc/httpd/conf.virtualhost.d/00-rewrite.conf
@@ -1,4 +1,4 @@
-<IfModule mod_rewrite.c>
+<IfModule rewrite_module>
     RewriteEngine On
     RewriteOptions Inherit
 </IfModule>
diff --git a/test/shpec/operation_shpec.sh b/test/shpec/operation_shpec.sh
index b84dd52..af1dd9a 100644
--- a/test/shpec/operation_shpec.sh
+++ b/test/shpec/operation_shpec.sh
@@ -1722,7 +1722,7 @@ function test_custom_configuration ()
 						/opt/php-hw/etc/httpd/conf.d/50-fcgid.conf \
 						1> /dev/null \
 						<<-CONFIG
-				<IfModule mod_fcgid.c>
+				<IfModule fcgid_module>
 				    AddHandler fcgid-script php
 				    AddType text/html php
 				    DirectoryIndex index.php
@@ -1736,7 +1736,7 @@ function test_custom_configuration ()
 				</IfModule>
 
 				<Directory "\${APACHE_CONTENT_ROOT}/\${APACHE_PUBLIC_DIRECTORY}">
-				    <IfModule mod_fcgid.c>
+				    <IfModule fcgid_module>
 				        FcgidWrapper "\${PACKAGE_PATH}/bin/php-wrapper" .php
 				        <Files ~ (\.php$)>
 				            Options +ExecCGI