From cd9f3170df90ef341c9c27fb4d17ffccd60b4ac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felipe=20Zipitr=C3=ADa?= Date: Wed, 17 Nov 2021 09:00:10 -0300 Subject: [PATCH] Update 2.4/Dockerfile Co-authored-by: Tianon Gravi --- 2.4/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 415bea1..5f4dbe4 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -203,11 +203,13 @@ RUN set -eux; \ -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \ -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \ -e 's!^(\s*TransferLog)\s+\S+!\1 /proc/self/fd/1!g' \ - -e 's!^User daemon!User www-data!g' \ - -e 's!^Group daemon!Group www-data!g' \ + -e 's!^(\s*User)\s+daemon\s*$!\1 www-data!g' \ + -e 's!^(\s*Group)\s+daemon\s*$!\1 www-data!g' \ "$HTTPD_PREFIX/conf/httpd.conf" \ "$HTTPD_PREFIX/conf/extra/httpd-ssl.conf" \ ; \ + grep -E '^\s*User www-data$' "$HTTPD_PREFIX/conf/httpd.conf"; \ + grep -E '^\s*Group www-data$' "$HTTPD_PREFIX/conf/httpd.conf"; \ \ # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies apt-mark auto '.*' > /dev/null; \