From 9a54cd4f942482c3c1086ab578078cc5c5cba080 Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.pro>
Date: Fri, 16 Aug 2024 15:52:09 -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/root/docker/setup/03-files.sh
rootfs/usr/local/bin/entrypoint.sh
rootfs/usr/local/etc/docker/init.d/01-php-fpm.sh
---
 rootfs/root/docker/setup/03-files.sh             | 1 +
 rootfs/usr/local/bin/entrypoint.sh               | 8 ++++----
 rootfs/usr/local/etc/docker/init.d/01-php-fpm.sh | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/rootfs/root/docker/setup/03-files.sh b/rootfs/root/docker/setup/03-files.sh
index 8ada8dc..a3e742a 100755
--- a/rootfs/root/docker/setup/03-files.sh
+++ b/rootfs/root/docker/setup/03-files.sh
@@ -27,6 +27,7 @@ exitCode=0
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Predifined actions
+rm -Rf /etc/php*/php-fpm*
 if [ -d "/tmp/bin" ]; then
   echo "Installing /tmp/bin to /usr/local/bin"
   chmod -Rf +x "/tmp/bin"
diff --git a/rootfs/usr/local/bin/entrypoint.sh b/rootfs/usr/local/bin/entrypoint.sh
index cf46771..1e0cb74 100755
--- a/rootfs/usr/local/bin/entrypoint.sh
+++ b/rootfs/usr/local/bin/entrypoint.sh
@@ -12,8 +12,8 @@
 # @@Description      :  Entrypoint file for pastebin
 # @@Changelog        :  New script
 # @@TODO             :  Better documentation
-# @@Other            :  
-# @@Resource         :  
+# @@Other            :
+# @@Resource         :
 # @@Terminal App     :  no
 # @@sudo/root        :  no
 # @@Template         :  other/docker-entrypoint
@@ -74,8 +74,8 @@ done
 RUNAS_USER="root" # normally root
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # User and group in which the service switches to - IE: nginx,apache,mysql,postgres
-SERVICE_USER="pastebin"  # execute command as another user
-SERVICE_GROUP="pastebin" # Set the service group
+SERVICE_USER="nginx"  # execute command as another user
+SERVICE_GROUP="nginx" # Set the service group
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set user and group ID
 SERVICE_UID="0" # set the user id
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 7770ed8..7130433 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
@@ -249,7 +249,7 @@ __pre_execute() {
   done
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   # Replace variables
-  HOSTNAME="$sysname" __initialize_replace_variables "$ETC_DIR" "$CONF_DIR" "$WWW_ROOT_DIR" "$DEFAULT_CONF_DIR"
+  HOSTNAME="$sysname" __initialize_replace_variables "$ETC_DIR" "$CONF_DIR" "$WWW_ROOT_DIR" "/etc/php"
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   # define actions