#166: Fixes issue with fcgid configuration loading order + test case paths.

Author: jdeathe

Dockerfile

@@ -26,10 +26,16 @@ ADD src /
 
 # ------------------------------------------------------------------------------
 # Provisioning
+# - Relocate default fcgid configuration to ensure correct loading order
 # - Replace placeholders with values in systemd service unit template
 # - Set permissions
 # ------------------------------------------------------------------------------
-RUN sed -i \
+RUN cat \
+		/etc/httpd/conf.d/fcgid.conf \
+		> /etc/httpd/conf.d/00-fcgid.conf \
+	&& truncate -s 0 \
+		/etc/httpd/conf.d/fcgid.conf \
+	&& sed -i \
 		-e "s~{{RELEASE_VERSION}}~${RELEASE_VERSION}~g" \
 		/etc/systemd/system/centos-ssh-apache-php-fcgi@.service \
 	&& chmod 700 \

test/shpec/operation_shpec.sh

@@ -1325,7 +1325,7 @@ function test_custom_configuration ()
 				docker exec -i \
 					apache-php.1 \
 					tee \
-						/etc/services-config/httpd/conf.d/05-virtual-host.conf \
+						/etc/httpd/conf.d/05-virtual-host.conf \
 						1> /dev/null \
 						<<-CONFIG
 				<VirtualHost *:80 *:8443>
@@ -1411,7 +1411,7 @@ function test_custom_configuration ()
 				docker exec -i \
 					apache-php.1 \
 					tee \
-						/etc/services-config/httpd/conf.d/05-virtual-host.conf \
+						/etc/httpd/conf.d/05-virtual-host.conf \
 						1> /dev/null \
 						<<-CONFIG
 				<VirtualHost *:80 *:8443>
@@ -1482,7 +1482,7 @@ function test_custom_configuration ()
 				docker exec -i \
 					apache-php.1 \
 					tee \
-						/etc/services-config/httpd/conf.d/05-virtual-host.conf \
+						/etc/httpd/conf.d/05-virtual-host.conf \
 						1> /dev/null \
 						<<-CONFIG
 				<VirtualHost *:80 *:8443>
@@ -1556,7 +1556,7 @@ function test_custom_configuration ()
 				docker exec -i \
 					apache-php.1 \
 					tee \
-						/etc/services-config/httpd/conf.d/05-virtual-host.conf \
+						/etc/httpd/conf.d/05-virtual-host.conf \
 						1> /dev/null \
 						<<-CONFIG
 				<VirtualHost *:80 *:8443>