From 61bd3c756aafdee4b84d7ca7cb7c722d8d69d84d Mon Sep 17 00:00:00 2001
From: Adam Warner <me@adamwarner.co.uk>
Date: Wed, 18 Jan 2023 15:26:29 +0000
Subject: [PATCH] I don't know why PHP_ENV_CONFIG is an environment variable.
 We don't need it to be

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
---
 src/Dockerfile                                     |  3 ---
 src/s6/debian-root/usr/local/bin/bash_functions.sh | 10 ++++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Dockerfile b/src/Dockerfile
index e3b5b5478..9cc923f31 100644
--- a/src/Dockerfile
+++ b/src/Dockerfile
@@ -12,9 +12,6 @@ COPY s6/service /usr/local/bin/service
 RUN bash -ex install.sh 2>&1 && \
     rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
 
-# php config start passes special ENVs into
-ARG PHP_ENV_CONFIG
-ENV PHP_ENV_CONFIG /etc/lighttpd/conf-enabled/15-pihole-admin.conf
 ARG PHP_ERROR_LOG
 ENV PHP_ERROR_LOG /var/log/lighttpd/error-pihole.log
 
diff --git a/src/s6/debian-root/usr/local/bin/bash_functions.sh b/src/s6/debian-root/usr/local/bin/bash_functions.sh
index 3c1c861e1..a37cd087c 100644
--- a/src/s6/debian-root/usr/local/bin/bash_functions.sh
+++ b/src/s6/debian-root/usr/local/bin/bash_functions.sh
@@ -348,6 +348,8 @@ setup_lighttpd_bind() {
 }
 
 setup_web_php_env() {
+    local config_file
+    config_file="/etc/lighttpd/conf-available/15-pihole-admin.conf"
     # if the environment variable VIRTUAL_HOST is not set, or is empty, then set it to the IP address of the container
     if [ -z "${VIRTUAL_HOST}" ] || [ "${VIRTUAL_HOST}" == "" ]; then
         VIRTUAL_HOST="${FTLCONF_LOCAL_IPV4}"
@@ -355,17 +357,17 @@ setup_web_php_env() {
 
     for config_var in "VIRTUAL_HOST" "CORS_HOSTS" "PHP_ERROR_LOG" "PIHOLE_DOCKER_TAG" "TZ"; do
       local beginning_of_line="                    \"${config_var}\" => "
-      if grep -qP "^$beginning_of_line" "$PHP_ENV_CONFIG" ; then
+      if grep -qP "^$beginning_of_line" "$config_file" ; then
         # replace line if already present
-        sed -i "/${beginning_of_line}/c\\${beginning_of_line}\"${!config_var}\"," "$PHP_ENV_CONFIG"
+        sed -i "/${beginning_of_line}/c\\${beginning_of_line}\"${!config_var}\"," "$config_file"
       else
         # add line otherwise
-        sed -i "/bin-environment/ a\\${beginning_of_line}\"${!config_var}\"," "$PHP_ENV_CONFIG"
+        sed -i "/bin-environment/ a\\${beginning_of_line}\"${!config_var}\"," "$config_file"
       fi
     done
 
     echo "  [i] Added ENV to php:"
-    grep -E '(VIRTUAL_HOST|CORS_HOSTS|PHP_ERROR_LOG|PIHOLE_DOCKER_TAG|TZ)' "$PHP_ENV_CONFIG"
+    grep -E '(VIRTUAL_HOST|CORS_HOSTS|PHP_ERROR_LOG|PIHOLE_DOCKER_TAG|TZ)' "$config_file"
 }
 
 setup_web_port() {