From e8e0f746eb76ec2fc2f439410698327d0b850899 Mon Sep 17 00:00:00 2001 From: josiah Date: Sat, 14 Nov 2020 14:26:41 -0600 Subject: [PATCH] Minor tweak to test not chowning my stupid data dir. --- 2.4/Dockerfile | 4 ++-- 2.4/docker-entrypoint.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 6083e29..5206b32 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -30,9 +30,9 @@ RUN set -ex; \ sed -i -e "/^#LoadModule ${i}_module.*/s/^#//" "conf/httpd.conf"; \ done; \ \ - # Run httpd as "www-data" (instead of "daemon"). + # Run httpd as "josiah" (instead of "daemon"). for i in User Group; do \ - sed -i -e "s|^$i .*|$i www-data|" "conf/httpd.conf"; \ + sed -i -e "s|^$i .*|$i josiah|" "conf/httpd.conf"; \ done; \ \ # Include enabled configs and sites. diff --git a/2.4/docker-entrypoint.sh b/2.4/docker-entrypoint.sh index 3ee4575..fb9c39f 100755 --- a/2.4/docker-entrypoint.sh +++ b/2.4/docker-entrypoint.sh @@ -101,6 +101,6 @@ fi # Create directories for Dav data and lock database. [ ! -d "/var/lib/dav/data" ] && mkdir -p "/var/lib/dav/data" [ ! -e "/var/lib/dav/DavLock" ] && touch "/var/lib/dav/DavLock" -chown -R www-data:www-data "/var/lib/dav" +# chown -R www-data:www-data "/var/lib/dav" exec "$@"