Merge pull request #67 from jdeathe/issue/63.1

ISSUE 63: Make consistent with upstream version.

Author: jdeathe

etc/apache-bootstrap

@@ -250,13 +250,25 @@ update_user_login ()
 
 DEFAULT_SYSTEM_USER=app
 DEFAULT_APACHE_USER=app-www
+DEFAULT_APACHE_LOAD_MODULES="
+ authz_user_module
+ log_config_module
+ expires_module
+ deflate_module
+ headers_module
+ setenvif_module
+ mime_module
+ status_module
+ dir_module
+ alias_module
+"
 PACKAGE_PATH=${PACKAGE_PATH:-/opt/app}
 PASSWORD_LENGTH=16
 
 OPTS_APACHE_CONTENT_ROOT="$(get_apache_content_root)"
 OPTS_APACHE_DOCUMENT_ROOT="${OPTS_APACHE_CONTENT_ROOT}/$(get_apache_public_directory)"
 OPTS_APACHE_EXTENDED_STATUS_ENABLED="${APACHE_EXTENDED_STATUS_ENABLED:-false}"
-OPTS_APACHE_LOAD_MODULES="${APACHE_LOAD_MODULES:-authz_user_module log_config_module expires_module deflate_module headers_module setenvif_module mime_module status_module dir_module alias_module reqtimeout_module}"
+OPTS_APACHE_LOAD_MODULES="${APACHE_LOAD_MODULES:-${DEFAULT_APACHE_LOAD_MODULES}}"
 OPTS_APACHE_MOD_SSL_ENABLED="${APACHE_MOD_SSL_ENABLED:-false}"
 OPTS_APACHE_RUN_GROUP="${APACHE_RUN_GROUP:-${DEFAULT_APACHE_USER}}"
 OPTS_APACHE_RUN_USER="${APACHE_RUN_USER:-${DEFAULT_APACHE_USER}}"
@@ -278,7 +290,9 @@ if [[ ${OPTS_APACHE_MOD_SSL_ENABLED} == true ]] \
 		-days 365 \
 		-subj "/C=--/ST=STATE/L=LOCALITY/O=ORGANIZATION/CN=${OPTS_APACHE_SERVER_NAME}" \
 		-keyout /etc/services-config/ssl/private/localhost.key \
-		-out /etc/services-config/ssl/certs/localhost.crt &
+		-out /etc/services-config/ssl/certs/localhost.crt \
+	&
+
 	PIDS[2]=${!}
 fi
 
@@ -341,20 +355,22 @@ HTTPD=${HTTPD:-${HTTPD_MPM_PREFORK}}
 if [[ ${HTTPD} == ${HTTPD_MPM_PREFORK} ]]; then
 	echo "Apache Server MPM: Prefork"
 	sed -i \
-	-e "s~HTTPD=${HTTPD_MPM_WORKER}~#HTTPD=${HTTPD_MPM_WORKER}~g" \
-	/etc/sysconfig/httpd
+		-e "s~HTTPD=${HTTPD_MPM_WORKER}~#HTTPD=${HTTPD_MPM_WORKER}~g" \
+		/etc/sysconfig/httpd
 elif [[ ${HTTPD} == ${HTTPD_MPM_WORKER} ]]; then
 	echo "Apache Server MPM: Worker"
 	sed -i \
-	-e "s~#HTTPD=${HTTPD_MPM_WORKER}~HTTPD=${HTTPD_MPM_WORKER}~g" \
-	/etc/sysconfig/httpd
+		-e "s~#HTTPD=${HTTPD_MPM_WORKER}~HTTPD=${HTTPD_MPM_WORKER}~g" \
+		/etc/sysconfig/httpd
 else
 	echo "ERROR: Apache Server MPM (${HTTPD}) unknown."
 	exit 1
 fi
 
 # Add local hosts entries
-add_hosts_entry 127.0.0.1 ${OPTS_APACHE_SERVER_NAME}${OPTS_APACHE_SERVER_ALIAS:+ }${OPTS_APACHE_SERVER_ALIAS}
+add_hosts_entry \
+	127.0.0.1 \
+	${OPTS_APACHE_SERVER_NAME}${OPTS_APACHE_SERVER_ALIAS:+ }${OPTS_APACHE_SERVER_ALIAS}
 
 # Set Apache EnableSendfile
 if [[ ${APACHE_DOCUMENT_ROOT_FILE_SYSTEM} == nfs ]]; then
@@ -380,9 +396,11 @@ if [[ ${OPTS_APACHE_MOD_SSL_ENABLED} == true ]] \
 	&& [[ -f ${OPTS_APACHE_CONTENT_ROOT}/vhost.conf ]]; then
 	echo "Generating SSL VirtualHost configuration."
 
+	SED_UNCOMMENT='s~\( *\)\(#\( \([^ ]\)\)\?\)\(.*\)$~\1\4\5~'
+
 	sed \
 		-e 's~^<VirtualHost \*:80 \*:8443>$~<VirtualHost \*:443>~g' \
-		-e '/<IfModule mod_ssl.c>/,/<\/IfModule>/ s~\( *\)\(#\( \([^ ]\)\)\?\)\(.*\)$~\1\4\5~' \
+		-e "/<IfModule mod_ssl.c>/,/<\/IfModule>/ ${SED_UNCOMMENT}" \
 		${OPTS_APACHE_CONTENT_ROOT}/vhost.conf > \
 		${OPTS_APACHE_CONTENT_ROOT}/vhost-ssl.conf
 fi
@@ -413,11 +431,12 @@ else
 		${VIRTUAL_HOST_CONFIGURATION_FILES}
 fi
 
-# Set correct ownership for fcgid php-wrapper and socket
-chown -R \
-	${OPTS_APACHE_RUN_USER}:${OPTS_APACHE_RUN_GROUP} \
-	/var/{www/app-bin,run/mod_fcgid} \
-	&> /dev/null
+# Set ownership for fcgid php-wrapper and socket if necessary
+if [[ -d /var/www/app-bin && -d /var/run/mod_fcgid ]]; then
+	chown -R \
+		${OPTS_APACHE_RUN_USER}:${OPTS_APACHE_RUN_GROUP} \
+		/var/{www/app-bin,run/mod_fcgid}
+fi
 
 # Set the system user's login names and groups
 update_user_login ${DEFAULT_SYSTEM_USER} ${OPTS_APACHE_SYSTEM_USER}