Merge pull request #24 from jdeathe/issue/23

ISSUE 23: Relocated php-wrapper to be outside the app home directory

Author: jdeathe

Dockerfile

@@ -51,14 +51,8 @@ RUN mv /etc/httpd/conf.d/php.conf /etc/httpd/conf.d/php.conf.off \
 # -----------------------------------------------------------------------------
 # Add the PHP Wrapper script
 # -----------------------------------------------------------------------------
-RUN mkdir -p /var/www/app/bin
-ADD var/www/app/bin/php-wrapper /var/www/app/bin/
-
-# -----------------------------------------------------------------------------
-# Set permissions & add to the template directory
-# -----------------------------------------------------------------------------
-RUN chmod -R 750 /var/www/app/bin \
-	&& cp -rpf /var/www/app/bin /var/www/.app-skel/bin
+ADD var/www/app-bin/php-wrapper /var/www/app-bin/
+RUN chmod -R 750 /var/www/app-bin
 
 # -----------------------------------------------------------------------------
 # Copy files into place

etc/apache-bootstrap

@@ -24,21 +24,12 @@ fi
 if [[ ! -n $(find ${APP_HOME_DIR} -maxdepth 1 -type f) ]] && [[ -d ${APP_HOME_DIR_TEMPLATE} ]]; then
 	echo Home directory ${APP_HOME_DIR} exists but is empty - populate it using ${APP_HOME_DIR_TEMPLATE}...
 	cp -rf ${APP_HOME_DIR_TEMPLATE}/. ${APP_HOME_DIR}/
-elif [[ ! -d ${APP_HOME_DIR}/bin || ! -n $(find ${APP_HOME_DIR}/bin -maxdepth 1 -type f) ]] && [[ -d ${APP_HOME_DIR_TEMPLATE}/bin ]]; then
-	echo Home directory ${APP_HOME_DIR}/bin is missing or empty empty - populate it using ${APP_HOME_DIR_TEMPLATE}/bin...
-	cp -rf ${APP_HOME_DIR_TEMPLATE}/bin ${APP_HOME_DIR}/
-elif [[ ! -d ${APP_HOME_DIR}/public_html ]]; then
-	echo ERROR: ${APP_HOME_DIR}/public_html not found.
-	exit 1
 fi
 
-# Correct permissions (750) must be set on the bin directory and the php-wrapper
-if [[ ! "$(stat -c %a ${APP_HOME_DIR}/bin)" == "750" ]]; then
-	echo ERROR: Permissions on ${APP_HOME_DIR}/bin must be 750...
-#	exit 1
-elif [[ ! "$(stat -c %a ${APP_HOME_DIR}/bin/php-wrapper)" == "750" ]]; then
-	echo ERROR: Permissions on ${APP_HOME_DIR}/bin/php-wrapper must be 750...
-#	exit 1
+# Document root directory is required
+if [[ ! -d ${APP_HOME_DIR}/public_html ]]; then
+	echo ERROR: ${APP_HOME_DIR}/public_html not found.
+	exit 1
 fi
 
 # If users need to change the vhost.conf the SSL version can be rebuilt if it is deleted
@@ -100,17 +91,23 @@ 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" -e "s~^LogLevel warn$~LogLevel debug~g" /etc/httpd/conf/httpd.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' ${APP_HOME_DIR}/vhost.conf
 	sed -i -e 's~#SuexecUserGroup \(.*\)$~SuexecUserGroup \1~g' ${APP_HOME_DIR}/vhost-ssl.conf
-	chown -R 502:502 /var/{www/app/bin,www/.app-skel/bin,run/mod_fcgid}
+	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~^User .*$~User apache~g" \
+		-e "s~^Group .*$~Group apache~g" /etc/httpd/conf/httpd.conf
 	sed -i -e 's~\([^#]\)SuexecUserGroup \(.*\)$~\1#SuexecUserGroup \2~g' ${APP_HOME_DIR}/vhost.conf
 	sed -i -e 's~\([^#]\)SuexecUserGroup \(.*\)$~\1#SuexecUserGroup \2~g' ${APP_HOME_DIR}/vhost-ssl.conf
-	chown -R apache:apache /var/{www/app/bin,www/.app-skel/bin,run/mod_fcgid}
+	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' ${APP_HOME_DIR}/vhost.conf
+sed -i -e 's~app/bin/php-wrapper~app-bin/php-wrapper~g' ${APP_HOME_DIR}/vhost-ssl.conf
+
 echo Loading Apache modules...
 for MODULE in ${APACHE_LOAD_MODULES}
 do
@@ -124,16 +121,15 @@ done
 echo "${OPTS_SERVICE_USER}:${OPTS_SERVICE_USER_PASSWORD}" | chpasswd
 echo "${OPTS_SERVICE_USER_GROUP}:${OPTS_SERVICE_USER_GROUP_PASSWORD}" | chpasswd
 
-echo
-echo "================================================================================"
-echo "Apache Credentials"
-echo "--------------------------------------------------------------------------------"
-echo "${OPTS_SERVICE_USER} : ${OPTS_SERVICE_USER_PASSWORD}"
-echo "${OPTS_SERVICE_USER_GROUP} : ${OPTS_SERVICE_USER_GROUP_PASSWORD}"
-echo "--------------------------------------------------------------------------------"
-echo
-
-# Allow some time for supervisor_stdout to start
-sleep 2
+	cat <<-EOT
+
+		================================================================================
+		Apache Credentials
+		--------------------------------------------------------------------------------
+		${OPTS_SERVICE_USER} : ${OPTS_SERVICE_USER_PASSWORD}
+		${OPTS_SERVICE_USER_GROUP} : ${OPTS_SERVICE_USER_GROUP_PASSWORD}
+		--------------------------------------------------------------------------------
+		
+	EOT
 
 exit 0

var/www/app/bin/php-wrapper renamed to var/www/app-bin/php-wrapper

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+source /etc/apache-bootstrap.conf
+
 # Allow PHP settings to be varied by passing a parameter to php-wrapper
 PHP_VERSION=$1
 PHP_WRAPPER_MODE=$2
@@ -46,15 +48,6 @@ else
 	X_PHP_CGI="/usr/bin/php-cgi"
 fi
 
-# Set the app home directory relative to the wrapper script
-ROOT_WWW_DIR='/var/www'
-
-if [ "$( cd ../..; pwd )" != "${ROOT_WWW_DIR}"  ]; then
-	echo "[PHP WRAPPER] Error: The application home directory is expected under ${ROOT_WWW_DIR}/"
-	exit 1
-fi
-APP_HOME_DIR="$( cd ..; pwd )"
-
 # Unset MySQL host address and port environment variables if they are not set in the vhost
 if [[ ${DB_MYSQL_PORT_3306_TCP_ADDR} == '${DB_MYSQL_PORT_3306_TCP_ADDR}' ]]; then
 	export DB_MYSQL_PORT_3306_TCP_ADDR=