Merge pull request #15 from devilbox/release-0.20

Upgrade vhost-gen and add PHP 5.2 compat mode

Dockerfile

@@ -10,7 +10,7 @@ LABEL \
 ###
 ### Build arguments
 ###
-ARG VHOST_GEN_GIT_REF=0.10
+ARG VHOST_GEN_GIT_REF=0.11
 ARG CERT_GEN_GIT_REF=0.2
 
 ENV BUILD_DEPS \

README.md

@@ -127,6 +127,7 @@ This Docker container adds a lot of injectables in order to customize it to your
 | PHP_FPM_ENABLE      | bool   | `0`     | Enable PHP-FPM for the default vhost and the mass virtual hosts. |
 | PHP_FPM_SERVER_ADDR | string | ``      | IP address or hostname of remote PHP-FPM server.<br/><strong>Required when enabling PHP.</strong> |
 | PHP_FPM_SERVER_PORT | int    | `9000`  | Port of remote PHP-FPM server |
+| COMPAT              | str    | -       | Set this value to `5.2` to enable PHP-FPM 5.2 compatbility mode. (Only when using PHP-FPM 5.2) |
 
 ##### Optional environmental variables (default vhost)
 

data/docker-entrypoint.d/04-php-fpm-compat.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+set -e
+set -u
+set -o pipefail
+
+
+############################################################
+# Functions
+############################################################
+
+###
+### Ensure COMPAT is set
+###
+export_php_fpm_compat() {
+	local varname="${1}"
+	local debug="${2}"
+	local value="0"
+
+	if ! env_set "${varname}"; then
+		log "info" "\$${varname} not set. Not enabling PHP 5.2 compatibility mode." "${debug}"
+		# Ensure variable is exported
+		eval "export ${varname}=0"
+	else
+		value="$( env_get "${varname}" )"
+		if [ "${value}" = "5.2" ]; then
+			log "info" "PHP 5.2 compatibility mode: Enabled" "${debug}"
+			# Ensure variable is exported
+			eval "export ${varname}=1"
+		else
+			log "info" "PHP 5.2 compatibility mode: Disabled" "${debug}"
+			# Ensure variable is exported
+			eval "export ${varname}=0"
+		fi
+	fi
+}

data/docker-entrypoint.sh

@@ -79,6 +79,7 @@ export_docker_logs "DOCKER_LOGS" "${DEBUG_LEVEL}"
 ###
 ### Ensure PHP-FPM variables are exported
 ###
+export_php_fpm_compat "COMPAT" "${DEBUG_LEVEL}"
 export_php_fpm_enable "PHP_FPM_ENABLE" "${DEBUG_LEVEL}"
 export_php_fpm_server_addr "PHP_FPM_SERVER_ADDR" "${DEBUG_LEVEL}"
 export_php_fpm_server_port "PHP_FPM_SERVER_PORT" "${DEBUG_LEVEL}"
@@ -122,6 +123,17 @@ fi
 ## vhost-gen Configuration
 #############################################################
 
+###
+### Ensure PHP 5.2 conmpat mode is applied
+###
+if [ "${COMPAT}" = "1" ]; then
+	# Replace current value 'FPM' with 'GENERIC'
+	log "info" "Setting PHP 5.2 compat mode" "${DEBUG_LEVEL}"
+	sed -i'' 's|\(ProxyFCGIBackendType\).*$|\1 GENERIC|g' /etc/vhost-gen/templates/apache24.yml
+else
+	log "info" "Disabling PHP 5.2 compat mode" "${DEBUG_LEVEL}"
+fi
+
 ###
 ### Enable and configure PHP-FPM
 ###