summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Boonen <janboonen5@gmail.com>2018-12-06 21:40:33 +0100
committerGitHub <noreply@github.com>2018-12-06 21:40:33 +0100
commit753ffb7ce251d782e5c69a47445a7463684059d2 (patch)
treec99709ae3a8ccb9ff7526b0ea7a597a8c3e9c28b
parent9fceea420309c2334241ed3a60fd9f47e7428217 (diff)
downloadapache-753ffb7ce251d782e5c69a47445a7463684059d2.tar.gz
apache-753ffb7ce251d782e5c69a47445a7463684059d2.tar.bz2
apache-753ffb7ce251d782e5c69a47445a7463684059d2.tar.xz
apache-753ffb7ce251d782e5c69a47445a7463684059d2.zip
Prevent corrupt Alias after restart of container.
When the LOCATION environment variable is set then a restart of a container will lead to a corrupt Alias configuration. The command 'sed -e "s|Alias /|Alias $LOCATION|"' will be executed again and thereby prepend the existing path with the same path.
-rwxr-xr-x2.4/docker-entrypoint.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/2.4/docker-entrypoint.sh b/2.4/docker-entrypoint.sh
index 84bf8e1..3ee4575 100755
--- a/2.4/docker-entrypoint.sh
+++ b/2.4/docker-entrypoint.sh
@@ -29,7 +29,7 @@ fi
# Configure dav.conf
if [ "x$LOCATION" != "x" ]; then
- sed -e "s|Alias /|Alias $LOCATION|" \
+ sed -e "s|Alias .*|Alias $LOCATION /var/lib/dav/data/|" \
-i "$HTTPD_PREFIX/conf/conf-available/dav.conf"
fi
if [ "x$REALM" != "x" ]; then