From 906eeeab0a07ad43194342cfb0a0d23276a5056d Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.pro>
Date: Tue, 27 Aug 2024 16:23:02 -0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?=
 =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

rootfs/usr/local/etc/docker/init.d/00-named.sh
rootfs/usr/local/etc/docker/init.d/03-php-fpm.sh
rootfs/usr/local/etc/docker/init.d/99-nginx.sh
---
 rootfs/usr/local/etc/docker/init.d/00-named.sh   | 2 +-
 rootfs/usr/local/etc/docker/init.d/03-php-fpm.sh | 2 +-
 rootfs/usr/local/etc/docker/init.d/99-nginx.sh   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rootfs/usr/local/etc/docker/init.d/00-named.sh b/rootfs/usr/local/etc/docker/init.d/00-named.sh
index 319a951..5fac9b4 100755
--- a/rootfs/usr/local/etc/docker/init.d/00-named.sh
+++ b/rootfs/usr/local/etc/docker/init.d/00-named.sh
@@ -567,10 +567,10 @@ __check_service "$1" && SERVICE_IS_RUNNING=yes
 [ -n "$USER_FILE_PREFIX" ] && { [ -d "$USER_FILE_PREFIX" ] || mkdir -p "$USER_FILE_PREFIX"; }
 [ -n "$ROOT_FILE_PREFIX" ] && { [ -d "$ROOT_FILE_PREFIX" ] || mkdir -p "$ROOT_FILE_PREFIX"; }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-[ "$IS_WEB_SERVER" = "yes" ] && RESET_ENV="yes"
 [ -n "$RUNAS_USER" ] || RUNAS_USER="root"
 [ -n "$SERVICE_USER" ] || SERVICE_USER="$RUNAS_USER"
 [ -n "$SERVICE_GROUP" ] || SERVICE_GROUP="${SERVICE_USER:-$RUNAS_USER}"
+[ "$IS_WEB_SERVER" = "yes" ] && RESET_ENV="yes" && __is_htdocs_mounted
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Database env
 if [ "$IS_DATABASE_SERVICE" = "yes" ] || [ "$USES_DATABASE_SERVICE" = "yes" ]; then
diff --git a/rootfs/usr/local/etc/docker/init.d/03-php-fpm.sh b/rootfs/usr/local/etc/docker/init.d/03-php-fpm.sh
index 28904ef..db197e4 100755
--- a/rootfs/usr/local/etc/docker/init.d/03-php-fpm.sh
+++ b/rootfs/usr/local/etc/docker/init.d/03-php-fpm.sh
@@ -467,10 +467,10 @@ __check_service "$1" && SERVICE_IS_RUNNING=yes
 [ -n "$USER_FILE_PREFIX" ] && { [ -d "$USER_FILE_PREFIX" ] || mkdir -p "$USER_FILE_PREFIX"; }
 [ -n "$ROOT_FILE_PREFIX" ] && { [ -d "$ROOT_FILE_PREFIX" ] || mkdir -p "$ROOT_FILE_PREFIX"; }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-[ "$IS_WEB_SERVER" = "yes" ] && RESET_ENV="yes"
 [ -n "$RUNAS_USER" ] || RUNAS_USER="root"
 [ -n "$SERVICE_USER" ] || SERVICE_USER="$RUNAS_USER"
 [ -n "$SERVICE_GROUP" ] || SERVICE_GROUP="${SERVICE_USER:-$RUNAS_USER}"
+[ "$IS_WEB_SERVER" = "yes" ] && RESET_ENV="yes" && __is_htdocs_mounted
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Database env
 if [ "$IS_DATABASE_SERVICE" = "yes" ] || [ "$USES_DATABASE_SERVICE" = "yes" ]; then
diff --git a/rootfs/usr/local/etc/docker/init.d/99-nginx.sh b/rootfs/usr/local/etc/docker/init.d/99-nginx.sh
index 83a16f3..a46e02f 100755
--- a/rootfs/usr/local/etc/docker/init.d/99-nginx.sh
+++ b/rootfs/usr/local/etc/docker/init.d/99-nginx.sh
@@ -467,10 +467,10 @@ __check_service "$1" && SERVICE_IS_RUNNING=yes
 [ -n "$USER_FILE_PREFIX" ] && { [ -d "$USER_FILE_PREFIX" ] || mkdir -p "$USER_FILE_PREFIX"; }
 [ -n "$ROOT_FILE_PREFIX" ] && { [ -d "$ROOT_FILE_PREFIX" ] || mkdir -p "$ROOT_FILE_PREFIX"; }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-[ "$IS_WEB_SERVER" = "yes" ] && RESET_ENV="yes"
 [ -n "$RUNAS_USER" ] || RUNAS_USER="root"
 [ -n "$SERVICE_USER" ] || SERVICE_USER="$RUNAS_USER"
 [ -n "$SERVICE_GROUP" ] || SERVICE_GROUP="${SERVICE_USER:-$RUNAS_USER}"
+[ "$IS_WEB_SERVER" = "yes" ] && RESET_ENV="yes" && __is_htdocs_mounted
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Database env
 if [ "$IS_DATABASE_SERVICE" = "yes" ] || [ "$USES_DATABASE_SERVICE" = "yes" ]; then