Adjust solution to be generalized for all APACHE_*_DIR variables, and…

… to handle edge cases in a less hard-coded manner
jpatovh · Jan 26, 2017 · e573f8f · e573f8f
1 parent f2bd9a3
commit e573f8f
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 30 deletions.
diff --git a/5.6/apache/apache2-foreground b/5.6/apache/apache2-foreground
@@ -10,17 +10,31 @@ if test -f "$APACHE_ENVVARS"; then
 	. "$APACHE_ENVVARS"
 fi
 
-: "${APACHE_PID_FILE:=${APACHE_RUN_DIR:=/var/run/apache2}/apache2.pid}"
-
-# setup directories and permissions
-mkdir -p /run/lock
-for dir in ${APACHE_RUN_DIR} ${APACHE_LOCK_DIR}
-do
-	mkdir -p ${dir}
-	chown -R "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$dir"
-done
-
 # Apache gets grumpy about PID files pre-existing
+: "${APACHE_RUN_DIR:=/var/run/apache2}"
+: "${APACHE_PID_FILE:=$APACHE_RUN_DIR/apache2.pid}"
 rm -f "$APACHE_PID_FILE"
 
+# create missing directories
+# (especially APACHE_RUN_DIR, APACHE_LOCK_DIR, and APACHE_LOG_DIR)
+for e in "${!APACHE_@}"; do
+	if [[ "$e" == *_DIR ]] && [[ "${!e}" == /* ]]; then
+		# handle "/var/lock" being a symlink to "/run/lock", but "/run/lock" not existing beforehand, so "/var/lock/something" fails to mkdir
+		#   mkdir: cannot create directory '/var/lock': File exists
+		dir="${!e}"
+		while [ "$dir" != "$(dirname "$dir")" ]; do
+			dir="$(dirname "$dir")"
+			if [ -d "$dir" ]; then
+				break
+			fi
+			absDir="$(readlink -f "$dir" 2>/dev/null || :)"
+			if [ -n "$absDir" ]; then
+				mkdir -p "$absDir"
+			fi
+		done
+
+		mkdir -p "${!e}"
+	fi
+done
+
 exec apache2 -DFOREGROUND "$@"
diff --git a/7.0/apache/apache2-foreground b/7.0/apache/apache2-foreground
@@ -10,17 +10,31 @@ if test -f "$APACHE_ENVVARS"; then
 	. "$APACHE_ENVVARS"
 fi
 
-: "${APACHE_PID_FILE:=${APACHE_RUN_DIR:=/var/run/apache2}/apache2.pid}"
-
-# setup directories and permissions
-mkdir -p /run/lock
-for dir in ${APACHE_RUN_DIR} ${APACHE_LOCK_DIR}
-do
-	mkdir -p ${dir}
-	chown -R "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$dir"
-done
-
 # Apache gets grumpy about PID files pre-existing
+: "${APACHE_RUN_DIR:=/var/run/apache2}"
+: "${APACHE_PID_FILE:=$APACHE_RUN_DIR/apache2.pid}"
 rm -f "$APACHE_PID_FILE"
 
+# create missing directories
+# (especially APACHE_RUN_DIR, APACHE_LOCK_DIR, and APACHE_LOG_DIR)
+for e in "${!APACHE_@}"; do
+	if [[ "$e" == *_DIR ]] && [[ "${!e}" == /* ]]; then
+		# handle "/var/lock" being a symlink to "/run/lock", but "/run/lock" not existing beforehand, so "/var/lock/something" fails to mkdir
+		#   mkdir: cannot create directory '/var/lock': File exists
+		dir="${!e}"
+		while [ "$dir" != "$(dirname "$dir")" ]; do
+			dir="$(dirname "$dir")"
+			if [ -d "$dir" ]; then
+				break
+			fi
+			absDir="$(readlink -f "$dir" 2>/dev/null || :)"
+			if [ -n "$absDir" ]; then
+				mkdir -p "$absDir"
+			fi
+		done
+
+		mkdir -p "${!e}"
+	fi
+done
+
 exec apache2 -DFOREGROUND "$@"
diff --git a/7.1/apache/apache2-foreground b/7.1/apache/apache2-foreground
@@ -10,17 +10,31 @@ if test -f "$APACHE_ENVVARS"; then
 	. "$APACHE_ENVVARS"
 fi
 
-: "${APACHE_PID_FILE:=${APACHE_RUN_DIR:=/var/run/apache2}/apache2.pid}"
-
-# setup directories and permissions
-mkdir -p /run/lock
-for dir in ${APACHE_RUN_DIR} ${APACHE_LOCK_DIR}
-do
-	mkdir -p ${dir}
-	chown -R "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$dir"
-done
-
 # Apache gets grumpy about PID files pre-existing
+: "${APACHE_RUN_DIR:=/var/run/apache2}"
+: "${APACHE_PID_FILE:=$APACHE_RUN_DIR/apache2.pid}"
 rm -f "$APACHE_PID_FILE"
 
+# create missing directories
+# (especially APACHE_RUN_DIR, APACHE_LOCK_DIR, and APACHE_LOG_DIR)
+for e in "${!APACHE_@}"; do
+	if [[ "$e" == *_DIR ]] && [[ "${!e}" == /* ]]; then
+		# handle "/var/lock" being a symlink to "/run/lock", but "/run/lock" not existing beforehand, so "/var/lock/something" fails to mkdir
+		#   mkdir: cannot create directory '/var/lock': File exists
+		dir="${!e}"
+		while [ "$dir" != "$(dirname "$dir")" ]; do
+			dir="$(dirname "$dir")"
+			if [ -d "$dir" ]; then
+				break
+			fi
+			absDir="$(readlink -f "$dir" 2>/dev/null || :)"
+			if [ -n "$absDir" ]; then
+				mkdir -p "$absDir"
+			fi
+		done
+
+		mkdir -p "${!e}"
+	fi
+done
+
 exec apache2 -DFOREGROUND "$@"