Merge pull request #51 from jdeathe/issue/43

ISSUE 43: Simplify enable/disable of SSL support.

Author: jdeathe

etc/apache-bootstrap

@@ -104,14 +104,8 @@ if [[ ${OPTS_APACHE_MOD_SSL_ENABLED} == true ]] && [[ ! -f ${OPTS_APP_HOME_DIR}/
 
 	# Enable the SSL VirtualHosts configuration
 	sed -i \
-		-e 's~^<VirtualHost \*:80>$~#<VirtualHost \*:80>~g' \
-		-e 's~^#<VirtualHost \*:443>$~<VirtualHost \*:443>~g' \
-		-e 's~#SSLEngine \(.*\)$~SSLEngine \1~g' \
-		-e 's~#SSLOptions \(.*\)$~SSLOptions \1~g' \
-		-e 's~#SSLProtocol \(.*\)$~SSLProtocol \1~g' \
-		-e 's~#SSLCipherSuite \(.*\)$~SSLCipherSuite \1~g' \
-		-e 's~#SSLCertificateFile \(.*\)$~SSLCertificateFile \1~g' \
-		-e 's~#SSLCertificateKeyFile \(.*\)$~SSLCertificateKeyFile \1~g' \
+		-e 's~^<VirtualHost \*:80 \*:8443>$~<VirtualHost \*:443>~g' \
+		-e '/<IfModule mod_ssl.c>/,/<\/IfModule>/ s~\( *\)\(#\( \([^ ]\)\)\?\)\(.*\)$~\1\4\5~' \
 		${OPTS_APP_HOME_DIR}/vhost-ssl.conf
 fi
 
@@ -120,11 +114,6 @@ if [[ ${OPTS_APACHE_MOD_SSL_ENABLED} == true ]]; then
 	echo "Enabling SSL support."
 	cat /etc/httpd/conf.d/ssl.conf.off > /etc/httpd/conf.d/ssl.conf
 
-	sed -i \
-		-e 's~^#NameVirtualHost \*:443$~NameVirtualHost \*:443~g' \
-		-e 's~^#Include ${OPTS_APP_HOME_DIR}/vhost-ssl.conf$~Include ${OPTS_APP_HOME_DIR}/vhost-ssl.conf~g' \
-		/etc/httpd/conf/httpd.conf
-
 	if [[ ! -f /etc/services-config/ssl/private/localhost.key ]] || [[ ! -f /etc/services-config/ssl/certs/localhost.crt ]]; then
 		echo "Generating new certificate."
 		openssl req \
@@ -141,11 +130,6 @@ if [[ ${OPTS_APACHE_MOD_SSL_ENABLED} == true ]]; then
 else
 	echo "Disabling SSL support."
 	> /etc/httpd/conf.d/ssl.conf
-
-	sed -i \
-		-e 's~^NameVirtualHost \*:443$~#NameVirtualHost \*:443~g' \
-		-e 's~^Include ${OPTS_APP_HOME_DIR}/vhost-ssl.conf$~#Include ${OPTS_APP_HOME_DIR}/vhost-ssl.conf~g' \
-		/etc/httpd/conf/httpd.conf
 fi
 
 # Set the service user / service group user

run.conf

@@ -8,10 +8,6 @@ SERVICE_UNIT_SHARED_GROUP=pool-1
 SERVICE_UNIT_LOCAL_ID=1
 SERVICE_UNIT_INSTANCE=1
 
-DATE_TIMEZONE=UTC
-
-DOCKER_NAME_DB_MYSQL=mysql.${SERVICE_UNIT_SHARED_GROUP}.1.1
-
 MOUNT_PATH_CONFIG=/etc/services-config
 # Mac hosts need to be in User writable directory
 if [ "$(uname)" == "Darwin" ]; then
@@ -26,7 +22,40 @@ fi
 DOCKER_IMAGE_REPOSITORY_NAME=${DOCKER_USER}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}
 DOCKER_NAME=${SERVICE_UNIT_NAME}.${SERVICE_UNIT_APP_GROUP}.${SERVICE_UNIT_LOCAL_ID}.${SERVICE_UNIT_INSTANCE}
 
+DOCKER_HOST_PORT_HTTP=8080
+DOCKER_HOST_PORT_HTTPS=8580
+DOCKER_HOST_PORT_SSH=2312
+DOCKER_HOST_PORT_XDEBUG=9000
+
 VOLUME_CONFIG_NAME=volume-config.${DOCKER_NAME}
 
+# Application configuration
+APACHE_LOAD_MODULES_DEFAULT="
+ authz_user_module
+ log_config_module
+ expires_module
+ deflate_module
+ headers_module
+ setenvif_module
+ mime_module
+ status_module
+ dir_module
+ alias_module
+"
+
+APACHE_LOAD_MODULES="${APACHE_LOAD_MODULES_DEFAULT}"
 APACHE_MOD_SSL_ENABLED=false
-HTTPD=/usr/sbin/httpd.worker
+APACHE_SERVER_ALIAS=app-1
+APACHE_SERVER_NAME=app-1.local
+APP_HOME_DIR=/var/www/app
+DATE_TIMEZONE=UTC
+HTTPD=/usr/sbin/httpd.worker
+SERVICE_USER=app
+SERVICE_USER_GROUP=app-www
+SERVICE_USER_GROUP_PASSWORD=
+SERVICE_USER_PASSWORD=
+SUEXECUSERGROUP=false
+
+# Linked container
+DOCKER_LINK_NAME_DB_MYSQL=mysql.${SERVICE_UNIT_SHARED_GROUP}.1.1
+DOCKER_LINK_ID_DB_MYSQL=db_mysql

run.sh

@@ -7,14 +7,6 @@ if [[ ${DIR_PATH} == */* ]] && [[ ${DIR_PATH} != $( pwd ) ]]; then
 fi
 
 source run.conf
-source etc/services-config/httpd/apache-bootstrap.conf
-
-# Enable/Disable SSL support
-if [[ ${APACHE_MOD_SSL_ENABLED} == true ]]; then
-	OPTS_HTTPS_PORT=443
-else
-	OPTS_HTTPS_PORT=8443
-fi
 
 have_docker_container_name ()
 {
@@ -142,28 +134,34 @@ else
 	DOCKER_OPERATOR_OPTIONS="-it --entrypoint /bin/bash --env TERM=${TERM:-xterm}"
 fi
 
+# Enable/Disable SSL support
+if [[ ${APACHE_MOD_SSL_ENABLED} == true ]]; then
+	DOCKER_PORT_OPTIONS="-p ${DOCKER_HOST_PORT_HTTP:-}:80 -p ${DOCKER_HOST_PORT_HTTPS:-}:443"
+else
+	DOCKER_PORT_OPTIONS="-p ${DOCKER_HOST_PORT_HTTP:-}:80 -p ${DOCKER_HOST_PORT_HTTPS:-}:8443"
+fi
+
 # In a sub-shell set xtrace - prints the docker command to screen for reference
 (
 set -x
 docker run \
 	${DOCKER_OPERATOR_OPTIONS} \
 	--name "${DOCKER_NAME}" \
-	-p 8080:80 \
-	-p 8580:${OPTS_HTTPS_PORT} \
-	--env "SERVICE_UNIT_APP_GROUP=app-1" \
-	--env "SERVICE_UNIT_LOCAL_ID=1" \
-	--env "SERVICE_UNIT_INSTANCE=1" \
-	--env "APACHE_SERVER_ALIAS=app-1" \
-	--env "APACHE_SERVER_NAME=app-1.local" \
+	${DOCKER_PORT_OPTIONS} \
+	--env "SERVICE_UNIT_APP_GROUP=${SERVICE_UNIT_APP_GROUP}" \
+	--env "SERVICE_UNIT_LOCAL_ID=${SERVICE_UNIT_LOCAL_ID}" \
+	--env "SERVICE_UNIT_INSTANCE=${SERVICE_UNIT_INSTANCE}" \
 	--env "APACHE_LOAD_MODULES=${APACHE_LOAD_MODULES}" \
-	--env "APACHE_MOD_SSL_ENABLED=false" \
+	--env "APACHE_MOD_SSL_ENABLED=${APACHE_MOD_SSL_ENABLED}" \
+	--env "APACHE_SERVER_ALIAS=${APACHE_SERVER_ALIAS}" \
+	--env "APACHE_SERVER_NAME=${APACHE_SERVER_NAME}" \
 	--env "APP_HOME_DIR=${APP_HOME_DIR}" \
-	--env "DATE_TIMEZONE=UTC" \
+	--env "DATE_TIMEZONE=${DATE_TIMEZONE}" \
 	--env "HTTPD=${HTTPD}" \
-	--env "SERVICE_USER=app" \
-	--env "SERVICE_USER_GROUP=app-www" \
-	--env "SERVICE_USER_PASSWORD=" \
-	--env "SUEXECUSERGROUP=false" \
+	--env "SERVICE_USER=${SERVICE_USER}" \
+	--env "SERVICE_USER_GROUP=${SERVICE_USER_GROUP}" \
+	--env "SERVICE_USER_PASSWORD=${SERVICE_USER_PASSWORD}" \
+	--env "SUEXECUSERGROUP=${SUEXECUSERGROUP}" \
 	--volumes-from ${VOLUME_CONFIG_NAME} \
 	-v ${MOUNT_PATH_DATA}/${SERVICE_UNIT_NAME}/${SERVICE_UNIT_APP_GROUP}:${APP_HOME_DIR} \
 	${DOCKER_IMAGE_REPOSITORY_NAME}${@:+ -c }"${@}"
@@ -175,18 +173,17 @@ docker run \
 # docker run \
 # 	${DOCKER_OPERATOR_OPTIONS} \
 # 	--name "${DOCKER_NAME}" \
-# 	-p 8080:80 \
-# 	-p 8580:${OPTS_HTTPS_PORT} \
-# 	-p 2312:22 \
-# 	-p :9000 \
-# 	--link ${DOCKER_NAME_DB_MYSQL}:db_mysql \
+# 	${DOCKER_PORT_OPTIONS} \
+# 	-p ${DOCKER_HOST_PORT_SSH:-}:22 \
+# 	-p ${DOCKER_HOST_PORT_XDEBUG:-}:9000 \
+# 	--link ${DOCKER_LINK_NAME_DB_MYSQL}:${DOCKER_LINK_ID_DB_MYSQL} \
 # 	--env "SERVICE_UNIT_APP_GROUP=app-1" \
 # 	--env "SERVICE_UNIT_LOCAL_ID=1" \
 # 	--env "SERVICE_UNIT_INSTANCE=1" \
-# 	--env "APACHE_SERVER_ALIAS=app-1 www.app-1 www.app-1.local" \
-# 	--env "APACHE_SERVER_NAME=app-1.local" \
 # 	--env "APACHE_LOAD_MODULES=${APACHE_LOAD_MODULES} rewrite_module" \
 # 	--env "APACHE_MOD_SSL_ENABLED=false" \
+# 	--env "APACHE_SERVER_ALIAS=app-1 www.app-1 www.app-1.local" \
+# 	--env "APACHE_SERVER_NAME=app-1.local" \
 # 	--env "APP_HOME_DIR=/var/www/app-1" \
 # 	--env "DATE_TIMEZONE=Europe/London" \
 # 	--env "HTTPD=/usr/sbin/httpd.worker" \