From 5f519300fa70f938f9c2bb75ed71450839ed0073 Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Wed, 14 Aug 2019 03:42:08 +0200
Subject: Fix port in Dockerfile instead of entrypoint.sh

---
 2.4/Dockerfile           | 8 +++++---
 2.4/docker-entrypoint.sh | 5 -----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/2.4/Dockerfile b/2.4/Dockerfile
index 98e05e9..d907b76 100644
--- a/2.4/Dockerfile
+++ b/2.4/Dockerfile
@@ -15,6 +15,8 @@ RUN set -ex; \
     touch "/var/lib/dav/DavLock"; \
     chown -R www-data:www-data "/var/lib/dav"; \
     \
+    # Configure port
+    sed -i -e "s|Listen .*|Listen 8080|" "conf/httpd.conf"; \
     # Enable DAV modules.
     for i in dav dav_fs; do \
         sed -i -e "/^#LoadModule ${i}_module.*/s/^#//" "conf/httpd.conf"; \
@@ -31,9 +33,9 @@ RUN set -ex; \
     done; \
     \
     # Run httpd as "www-data" (instead of "daemon").
-    for i in User Group; do \
-        sed -i -e "s|^$i .*|$i www-data|" "conf/httpd.conf"; \
-    done; \
+    #for i in User Group; do \
+    #    sed -i -e "s|^$i .*|$i www-data|" "conf/httpd.conf"; \
+    #done; \
     \
     # Include enabled configs and sites.
     printf '%s\n' "Include conf/conf-enabled/*.conf" \
diff --git a/2.4/docker-entrypoint.sh b/2.4/docker-entrypoint.sh
index 117f63c..4430d20 100755
--- a/2.4/docker-entrypoint.sh
+++ b/2.4/docker-entrypoint.sh
@@ -14,11 +14,6 @@ set -e
 # Just in case this environment variable has gone missing.
 HTTPD_PREFIX="${HTTPD_PREFIX:-/usr/local/apache2}"
 
-# Configure port
-sed -e "s|Listen .*|Listen 8080|" \
-    -i "$HTTPD_PREFIX"/conf/httpd.conf
-
-
 # Configure vhosts.
 if [ "x$SERVER_NAMES" != "x" ]; then
     # Use first domain as Apache ServerName.
-- 
cgit v1.2.1