From 9e2576bf6672661134cfae05f3ea6878dabe83e3 Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.com>
Date: Thu, 16 Mar 2023 16:15:06 -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/01-php-fpm.sh   |  4 ++--
 rootfs/usr/local/etc/docker/init.d/zz-caddy.sh     | 14 +++++++-------
 .../share/template-files/data/htdocs/www/index.php |  2 --
 3 files changed, 9 insertions(+), 11 deletions(-)

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 071e8fc..4317a09 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
@@ -24,7 +24,7 @@ done
 # execute command variables
 WORKDIR=""                                                                              # set working directory
 SERVICE_UID="0"                                                                         # set the user id
-SERVICE_USER="root"                                                                     # execute command as another user
+SERVICE_USER="daemon"                                                                   # execute command as another user
 SERVICE_PORT="9000"                                                                     # port which service is listening on
 EXEC_CMD_BIN="php-fpm"                                                                  # command to execute
 EXEC_CMD_ARGS="--allow-to-run-as-root --nodaemonize --fpm-config /etc/php/php-fpm.conf" # command arguments
@@ -36,7 +36,7 @@ conf_dir="/config/php"
 www_dir="${WWW_ROOT_DIR:-/data/htdocs}"
 etc_dir="${PHP_INI_DIR:-$(__find_php_ini)}"
 php_bin="${PHP_BIN_DIR:-$(__find_php_bin)}"
-php_user="${SERVICE_USER//root/daemon}"
+php_user="$SERVICE_USER"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # use this function to update config files - IE: change port
 __update_conf_files() {
diff --git a/rootfs/usr/local/etc/docker/init.d/zz-caddy.sh b/rootfs/usr/local/etc/docker/init.d/zz-caddy.sh
index bb57b74..bbe82f4 100755
--- a/rootfs/usr/local/etc/docker/init.d/zz-caddy.sh
+++ b/rootfs/usr/local/etc/docker/init.d/zz-caddy.sh
@@ -23,13 +23,13 @@ done
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # execute command variables
-WORKDIR=""                                                            # set working directory
-SERVICE_UID="0"                                                       # set the user id
-SERVICE_USER="root"                                                   # execute command as another user
-SERVICE_PORT=""                                                       # port which service is listening on
-EXEC_CMD_BIN="caddy"                                                  # command to execute
-EXEC_CMD_ARGS="run --config /etc/caddy/Caddyfile --adapter caddyfile" # command arguments
-PRE_EXEC_MESSAGE=""                                                   # Show message before execute
+WORKDIR=""                                        # set working directory
+SERVICE_UID="0"                                   # set the user id
+SERVICE_USER="root"                               # execute command as another user
+SERVICE_PORT=""                                   # port which service is listening on
+EXEC_CMD_BIN="caddy"                              # command to execute
+EXEC_CMD_ARGS="run --config /etc/caddy/Caddyfile" # command arguments
+PRE_EXEC_MESSAGE=""                               # Show message before execute
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Other variables that are needed
 etc_dir="/etc/caddy"
diff --git a/rootfs/usr/local/share/template-files/data/htdocs/www/index.php b/rootfs/usr/local/share/template-files/data/htdocs/www/index.php
index d642561..86be7e6 100644
--- a/rootfs/usr/local/share/template-files/data/htdocs/www/index.php
+++ b/rootfs/usr/local/share/template-files/data/htdocs/www/index.php
@@ -64,8 +64,6 @@
 
     SERVER:
     <?php echo $_SERVER['SERVER_SOFTWARE']; ?> <br />
-    SERVER Address:
-    <?php echo $_SERVER['SERVER_ADDR']; ?> <br />
 
   </h2>
   <br /><br />