From a58b1c08bdb048b6db3f3a6cc2091633b8027681 Mon Sep 17 00:00:00 2001 From: RD WebDesign Date: Wed, 4 Jan 2023 22:15:06 -0300 Subject: [PATCH] Change `PHP_ENV_CONFIG` and `setup_web_php_env()` Signed-off-by: RD WebDesign --- src/Dockerfile | 2 +- src/s6/debian-root/usr/local/bin/bash_functions.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Dockerfile b/src/Dockerfile index 8a05b55..fbced42 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -14,7 +14,7 @@ RUN bash -ex install.sh 2>&1 && \ # php config start passes special ENVs into ARG PHP_ENV_CONFIG -ENV PHP_ENV_CONFIG /etc/lighttpd/conf-enabled/15-fastcgi-php.conf +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 85ff87e..92ef399 100644 --- a/src/s6/debian-root/usr/local/bin/bash_functions.sh +++ b/src/s6/debian-root/usr/local/bin/bash_functions.sh @@ -353,8 +353,8 @@ setup_web_php_env() { fi; for config_var in "VIRTUAL_HOST" "CORS_HOSTS" "PHP_ERROR_LOG" "PIHOLE_DOCKER_TAG" "TZ"; do - local beginning_of_line="\t\t\t\"${config_var}\" => " - if grep -qP "$beginning_of_line" "$PHP_ENV_CONFIG" ; then + local beginning_of_line=" \"${config_var}\" => " + if grep -qP "^$beginning_of_line" "$PHP_ENV_CONFIG" ; then # replace line if already present sed -i "/${beginning_of_line}/c\\${beginning_of_line}\"${!config_var}\"," "$PHP_ENV_CONFIG" else