From ba34d9d89abd9a64af71470093594b1b49aca50b Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.pro>
Date: Mon, 3 Feb 2025 15:20:15 -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
.env.scripts
rootfs/root/docker/setup/05-custom.sh
rootfs/usr/local/bin/entrypoint.sh
rootfs/usr/local/etc/docker/init.d/01-php-fpm.sh
rootfs/usr/local/etc/docker/init.d/99-nginx.sh
rootfs/usr/local/share/template-files/config/env/default.sample
---
 .env.scripts                                                  | 2 +-
 Dockerfile                                                    | 2 +-
 rootfs/root/docker/setup/05-custom.sh                         | 2 +-
 rootfs/usr/local/bin/entrypoint.sh                            | 4 ++--
 rootfs/usr/local/etc/docker/init.d/01-php-fpm.sh              | 2 +-
 rootfs/usr/local/etc/docker/init.d/99-nginx.sh                | 2 +-
 .../usr/local/share/template-files/config/env/default.sample  | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.env.scripts b/.env.scripts
index 7cd4f53..1a757fc 100644
--- a/.env.scripts
+++ b/.env.scripts
@@ -42,7 +42,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 96683d3..e55b562 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ ARG PHP_SERVER="stikked"
 ARG BUILD_DATE="202408151738"
 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/root/docker/setup/05-custom.sh b/rootfs/root/docker/setup/05-custom.sh
index eb0dc67..e1b181e 100755
--- a/rootfs/root/docker/setup/05-custom.sh
+++ b/rootfs/root/docker/setup/05-custom.sh
@@ -24,7 +24,7 @@ set -o pipefail
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set env variables
 exitCode=0
-WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/share/httpd/default}"
+WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/local/share/httpd/default}"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Predifined actions
 
diff --git a/rootfs/usr/local/bin/entrypoint.sh b/rootfs/usr/local/bin/entrypoint.sh
index a10a3c4..f93b303 100755
--- a/rootfs/usr/local/bin/entrypoint.sh
+++ b/rootfs/usr/local/bin/entrypoint.sh
@@ -88,8 +88,8 @@ WEB_SERVER_PORT="" # port : 80,443
 SERVER_PORTS="" # specifiy other ports
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Server directories
-WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/share/httpd/default}"   # set default web dir
-DATABASE_DIR="${DATABASE_DIR:-/data/db/${DBTYPE:-sqlite}}" # set database dir
+WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/local/share/httpd/default}" # set default web dir
+DATABASE_DIR="${DATABASE_DIR:-/data/db/${DBTYPE:-sqlite}}"     # set database dir
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Healthcheck variables
 HEALTH_ENABLED="yes" # enable healthcheck [yes/no]
diff --git a/rootfs/usr/local/etc/docker/init.d/01-php-fpm.sh b/rootfs/usr/local/etc/docker/init.d/01-php-fpm.sh
index 330b2d4..345a302 100755
--- a/rootfs/usr/local/etc/docker/init.d/01-php-fpm.sh
+++ b/rootfs/usr/local/etc/docker/init.d/01-php-fpm.sh
@@ -73,7 +73,7 @@ DATABASE_BASE_DIR="${DATABASE_BASE_DIR:-/data/db}"
 DATABASE_DIR="${DATABASE_DIR_PHP_FPM:-$DATABASE_BASE_DIR/sqlite}"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # 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/etc/docker/init.d/99-nginx.sh b/rootfs/usr/local/etc/docker/init.d/99-nginx.sh
index 8625657..a80cc12 100755
--- a/rootfs/usr/local/etc/docker/init.d/99-nginx.sh
+++ b/rootfs/usr/local/etc/docker/init.d/99-nginx.sh
@@ -73,7 +73,7 @@ DATABASE_BASE_DIR="${DATABASE_BASE_DIR:-/data/db}"
 DATABASE_DIR="${DATABASE_DIR_NGINX:-$DATABASE_BASE_DIR/sqlite}"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set webroot
-WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/share/httpd/default}"
+WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/local/share/httpd/default}"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Default predefined variables
 DATA_DIR="/data/nginx"   # 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 65ff1df..c4271ed 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}"