From 24c83e50ad86cabe8a068cb5833324f5d513ef37 Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.pro>
Date: Mon, 3 Feb 2025 15:20:01 -0500
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

Dockerfile
Dockerfile.7
Dockerfile.8
.env.scripts
.env.scripts.7
.env.scripts.8
rootfs/usr/local/etc/docker/init.d/01-php.sh
rootfs/usr/local/etc/docker/init.d/05-php-fpm.sh
rootfs/usr/local/share/template-files/config/env/default.sample
---
 .env.scripts                                                | 2 +-
 .env.scripts.7                                              | 2 +-
 .env.scripts.8                                              | 2 +-
 Dockerfile                                                  | 2 +-
 Dockerfile.7                                                | 2 +-
 Dockerfile.8                                                | 2 +-
 rootfs/usr/local/etc/docker/init.d/01-php.sh                | 6 +++---
 rootfs/usr/local/etc/docker/init.d/05-php-fpm.sh            | 2 +-
 .../local/share/template-files/config/env/default.sample    | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.env.scripts b/.env.scripts
index 860c481..89e4b80 100644
--- a/.env.scripts
+++ b/.env.scripts
@@ -50,7 +50,7 @@ NODE_VERSION="system"
 NODE_MANAGER="system"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Default directories
-WWW_ROOT_DIR="/usr/share/httpd/default"
+WWW_ROOT_DIR="/usr/local/share/httpd/default"
 DEFAULT_FILE_DIR="/usr/local/share/template-files"
 DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
 DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
diff --git a/.env.scripts.7 b/.env.scripts.7
index 7979ea4..6434690 100644
--- a/.env.scripts.7
+++ b/.env.scripts.7
@@ -50,7 +50,7 @@ NODE_VERSION="system"
 NODE_MANAGER="system"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Default directories
-WWW_ROOT_DIR="/usr/share/httpd/default"
+WWW_ROOT_DIR="/usr/local/share/httpd/default"
 DEFAULT_FILE_DIR="/usr/local/share/template-files"
 DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
 DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
diff --git a/.env.scripts.8 b/.env.scripts.8
index 9a7bd2c..7a958eb 100644
--- a/.env.scripts.8
+++ b/.env.scripts.8
@@ -50,7 +50,7 @@ NODE_VERSION="system"
 NODE_MANAGER="system"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Default directories
-WWW_ROOT_DIR="/usr/share/httpd/default"
+WWW_ROOT_DIR="/usr/local/share/httpd/default"
 DEFAULT_FILE_DIR="/usr/local/share/template-files"
 DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
 DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
diff --git a/Dockerfile b/Dockerfile
index 67f48b9..17fe7e3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ARG PHP_SERVER="php"
 ARG BUILD_DATE="202410090957"
 ARG LANGUAGE="en_US.UTF-8"
 ARG TIMEZONE="America/New_York"
-ARG WWW_ROOT_DIR="/usr/share/httpd/default"
+ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
 ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
 ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
 ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
diff --git a/Dockerfile.7 b/Dockerfile.7
index 94091d5..4a8de25 100644
--- a/Dockerfile.7
+++ b/Dockerfile.7
@@ -5,7 +5,7 @@ ARG PHP_SERVER="php"
 ARG BUILD_DATE="202410090957"
 ARG LANGUAGE="en_US.UTF-8"
 ARG TIMEZONE="America/New_York"
-ARG WWW_ROOT_DIR="/usr/share/httpd/default"
+ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
 ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
 ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
 ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
diff --git a/Dockerfile.8 b/Dockerfile.8
index e531bc9..ae608fa 100644
--- a/Dockerfile.8
+++ b/Dockerfile.8
@@ -5,7 +5,7 @@ ARG PHP_SERVER="php"
 ARG BUILD_DATE="202410090957"
 ARG LANGUAGE="en_US.UTF-8"
 ARG TIMEZONE="America/New_York"
-ARG WWW_ROOT_DIR="/usr/share/httpd/default"
+ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
 ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
 ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
 ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
diff --git a/rootfs/usr/local/etc/docker/init.d/01-php.sh b/rootfs/usr/local/etc/docker/init.d/01-php.sh
index 17ce0df..e0c04b6 100755
--- a/rootfs/usr/local/etc/docker/init.d/01-php.sh
+++ b/rootfs/usr/local/etc/docker/init.d/01-php.sh
@@ -62,7 +62,7 @@ START_SCRIPT="/usr/local/etc/docker/exec/$SERVICE_NAME"
 RESET_ENV="no"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set webroot
-WWW_ROOT_DIR="/usr/share/httpd/default"
+WWW_ROOT_DIR="/usr/local/share/httpd/default"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Default predefined variables
 DATA_DIR="/data/php"   # set data directory
@@ -204,9 +204,9 @@ __run_pre_execute_checks() {
     { [ -d "/data/htdocs/www" ] && PHP_DEV_SERVER_ROOT="/data/htdocs/www"; } || { [ -d "/data/www" ] && PHP_DEV_SERVER_ROOT="/data/www"; }
     WWW_ROOT_DIR="$PHP_DEV_SERVER_ROOT"
     [ -d "$WWW_ROOT_DIR" ] || mkdir -p "$WWW_ROOT_DIR"
-    if [ -d "/usr/share/httpd/default" ]; then
+    if [ -d "/usr/local/share/httpd/default" ]; then
       if [ ! -d "$WWW_ROOT_DIR" ] || __is_dir_empty "$WWW_ROOT_DIR"; then
-        __file_copy "/usr/share/httpd/default" "$WWW_ROOT_DIR"
+        __file_copy "/usr/local/share/httpd/default" "$WWW_ROOT_DIR"
       fi
     elif [ ! -d "$WWW_ROOT_DIR" ]; then
       mkdir -p "$WWW_ROOT_DIR"
diff --git a/rootfs/usr/local/etc/docker/init.d/05-php-fpm.sh b/rootfs/usr/local/etc/docker/init.d/05-php-fpm.sh
index b5bbebd..346500d 100755
--- a/rootfs/usr/local/etc/docker/init.d/05-php-fpm.sh
+++ b/rootfs/usr/local/etc/docker/init.d/05-php-fpm.sh
@@ -62,7 +62,7 @@ START_SCRIPT="/usr/local/etc/docker/exec/$SERVICE_NAME"
 RESET_ENV="no"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set webroot
-WWW_ROOT_DIR="/usr/share/httpd/default"
+WWW_ROOT_DIR="/usr/local/share/httpd/default"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Default predefined variables
 DATA_DIR="/data/php-fpm"   # set data directory
diff --git a/rootfs/usr/local/share/template-files/config/env/default.sample b/rootfs/usr/local/share/template-files/config/env/default.sample
index 0b6b0b3..636a439 100644
--- a/rootfs/usr/local/share/template-files/config/env/default.sample
+++ b/rootfs/usr/local/share/template-files/config/env/default.sample
@@ -14,7 +14,7 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # directory settings
 #BACKUP_DIR="${BACKUP_DIR:-/data/backups}"
-#WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/share/httpd/default}"
+#WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/local/share/httpd/default}"
 #LOCAL_BIN_DIR="${LOCAL_BIN_DIR:-/usr/local/bin}"
 #DATABASE_BASE_DIR="${DATABASE_BASE_DIR:-/data/db}"
 #DEFAULT_DATA_DIR="${DEFAULT_DATA_DIR:-/usr/local/share/template-files/data}"