From 8b53f6e7696c80ce581bcfe1c0d90972be170dac Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.pro>
Date: Tue, 27 Aug 2024 11:49:00 -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/bin/entrypoint.sh
rootfs/usr/local/etc/docker/init.d/03-php-fpm.sh
---
 rootfs/usr/local/bin/entrypoint.sh               | 10 +++++-----
 rootfs/usr/local/etc/docker/init.d/03-php-fpm.sh | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/rootfs/usr/local/bin/entrypoint.sh b/rootfs/usr/local/bin/entrypoint.sh
index 33e3496..a2393ea 100755
--- a/rootfs/usr/local/bin/entrypoint.sh
+++ b/rootfs/usr/local/bin/entrypoint.sh
@@ -78,8 +78,8 @@ unset set_env
 RUNAS_USER="root" # normally root
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # User and group in which the service switches to - IE: nginx,apache,mysql,postgres
-SERVICE_USER="bind"  # execute command as another user
-SERVICE_GROUP="bind" # Set the service group
+SERVICE_USER="named"  # execute command as another user
+SERVICE_GROUP="named" # Set the service group
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set user and group ID
 SERVICE_UID="0" # set the user id
@@ -92,9 +92,9 @@ WEB_SERVER_PORT="" # port : 80,443
 SERVER_PORTS="" # specifiy other ports
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Healthcheck variables
-HEALTH_ENABLED="yes"                    # enable healthcheck [yes/no]
-SERVICES_LIST="tini,bind,nginx,php-fpm" # comma seperated list of processes for the healthcheck
-HEALTH_ENDPOINTS=""                     # url endpoints: [http://localhost/health,http://localhost/test]
+HEALTH_ENABLED="yes"                     # enable healthcheck [yes/no]
+SERVICES_LIST="tini,named,nginx,php-fpm" # comma seperated list of processes for the healthcheck
+HEALTH_ENDPOINTS=""                      # url endpoints: [http://localhost/health,http://localhost/test]
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Update path var
 export PATH RUNAS_USER SERVICE_USER SERVICE_GROUP SERVICE_UID SERVICE_GID WWW_ROOT_DIR DATABASE_DIR
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 19ef10a..031b696 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
@@ -79,8 +79,8 @@ DATABASE_DIR="$DATABASE_BASE_DIR/$DATABASE_SUBDIR"
 WWW_ROOT_DIR="/usr/share/httpd/default"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Default predefined variables
-DATA_DIR="/data/php-fpm" # set data directory
-CONF_DIR="/config/php"   # set config directory
+DATA_DIR="/data/php"   # set data directory
+CONF_DIR="/config/php" # set config directory
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # set the containers etc directory
 ETC_DIR="/etc/php"
@@ -88,9 +88,9 @@ ETC_DIR="/etc/php"
 # set the var dir
 VAR_DIR=""
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-TMP_DIR="/tmp/php-fpm"       # set the temp dir
-RUN_DIR="/run/php-fpm"       # set scripts pid dir
-LOG_DIR="/data/logs/php-fpm" # set log directory
+TMP_DIR="/tmp/php"       # set the temp dir
+RUN_DIR="/run/php"       # set scripts pid dir
+LOG_DIR="/data/logs/php" # set log directory
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set the working dir
 WORK_DIR=""