ISSUE 29: Review of sed commands.

Author: jdeathe

Dockerfile

@@ -25,14 +25,14 @@ RUN rpm --rebuilddb \
 # Apache mime_magic module should be disabled with FastCGI
 # -----------------------------------------------------------------------------
 RUN sed -i \
-	-e 's~^LoadModule mime_magic_module modules/mod_mime_magic.so~#LoadModule mime_magic_module modules/mod_mime_magic.so~g' \
+	-e 's~^LoadModule mime_magic_module ~#LoadModule mime_magic_module ~g' \
 	/etc/httpd/conf/httpd.conf
 
 # -----------------------------------------------------------------------------
 # Enable the pathinfo fix
 # -----------------------------------------------------------------------------
 RUN sed -i \
-	-e 's~^;cgi.fix_pathinfo=1~cgi.fix_pathinfo = 1~g' \
+	-e 's~^;cgi.fix_pathinfo=1$~cgi.fix_pathinfo=1~g' \
 	/etc/php.ini
 
 # -----------------------------------------------------------------------------

etc/apache-bootstrap

@@ -101,23 +101,29 @@ fi
 
 # Set the Apache (run) service user/group
 if [[ ${OPTS_SUEXECUSERGROUP} == true ]]; then
-	sed -i -e "s~^User .*$~User ${OPTS_SERVICE_USER_GROUP}~g" \
-		-e "s~^Group .*$~Group ${OPTS_SERVICE_USER_GROUP}~g" /etc/httpd/conf/httpd.conf
-	sed -i -e 's~#SuexecUserGroup \(.*\)$~SuexecUserGroup \1~g' ${OPTS_APP_HOME_DIR}/vhost.conf
-	sed -i -e 's~#SuexecUserGroup \(.*\)$~SuexecUserGroup \1~g' ${OPTS_APP_HOME_DIR}/vhost-ssl.conf
+	sed -i \
+		-e "s~^User .*$~User ${OPTS_SERVICE_USER_GROUP}~g" \
+		-e "s~^Group .*$~Group ${OPTS_SERVICE_USER_GROUP}~g" \
+		/etc/httpd/conf/httpd.conf
+	sed -i \
+		-e 's~#SuexecUserGroup \(.*\)$~SuexecUserGroup \1~g' \
+		-e 's~app/bin/php-wrapper~app-bin/php-wrapper~g' \
+		${OPTS_APP_HOME_DIR}/vhost.conf \
+		${OPTS_APP_HOME_DIR}/vhost-ssl.conf
 	chown -R 502:502 /var/{www/app-bin,run/mod_fcgid}
 else
-	sed -i -e "s~^User .*$~User apache~g" \
-		-e "s~^Group .*$~Group apache~g" /etc/httpd/conf/httpd.conf
-	sed -i -e 's~\([^#]\)SuexecUserGroup \(.*\)$~\1#SuexecUserGroup \2~g' ${OPTS_APP_HOME_DIR}/vhost.conf
-	sed -i -e 's~\([^#]\)SuexecUserGroup \(.*\)$~\1#SuexecUserGroup \2~g' ${OPTS_APP_HOME_DIR}/vhost-ssl.conf
+	sed -i \
+		-e "s~^User .*$~User apache~g" \
+		-e "s~^Group .*$~Group apache~g" \
+		/etc/httpd/conf/httpd.conf
+	sed -i \
+		-e 's~\([^#]\)SuexecUserGroup \(.*\)$~\1#SuexecUserGroup \2~g' \
+		-e 's~app/bin/php-wrapper~app-bin/php-wrapper~g' \
+		${OPTS_APP_HOME_DIR}/vhost.conf \
+		${OPTS_APP_HOME_DIR}/vhost-ssl.conf
 	chown -R apache:apache /var/{www/app-bin,run/mod_fcgid}
 fi
 
-# Update any existing instances of php-wrapper path in the Virtual Host
-sed -i -e 's~app/bin/php-wrapper~app-bin/php-wrapper~g' ${OPTS_APP_HOME_DIR}/vhost.conf
-sed -i -e 's~app/bin/php-wrapper~app-bin/php-wrapper~g' ${OPTS_APP_HOME_DIR}/vhost-ssl.conf
-
 echo "Loading Apache modules."
 for MODULE in ${APACHE_LOAD_MODULES}; do
 	echo " - ${MODULE}"