diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2019-08-14 18:03:49 +0200 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2019-08-14 18:03:49 +0200 |
| commit | e373ffc2f8b9450615f9a0f4351e94b9baa402f8 (patch) | |
| tree | 75b0226eff9b79b9ce7d221e2383513a2760d18a | |
| parent | 407df523e5262280f0f5f5d5a3ebfd2a89207580 (diff) | |
| download | apache-e373ffc2f8b9450615f9a0f4351e94b9baa402f8.tar.gz apache-e373ffc2f8b9450615f9a0f4351e94b9baa402f8.tar.bz2 apache-e373ffc2f8b9450615f9a0f4351e94b9baa402f8.tar.xz apache-e373ffc2f8b9450615f9a0f4351e94b9baa402f8.zip | |
Move DavLock to temporary folder as well
| -rw-r--r-- | 2.4/Dockerfile | 5 | ||||
| -rw-r--r-- | 2.4/conf/conf-available/dav.conf | 2 | ||||
| -rw-r--r-- | 2.4/conf/sites-available/default-ssl.conf | 4 | ||||
| -rwxr-xr-x | 2.4/docker-entrypoint.sh | 3 |
4 files changed, 6 insertions, 8 deletions
diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 6d02469..d9d6002 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -11,8 +11,7 @@ RUN set -ex; \ mkdir -p "/var/www/html"; \ # Create directories for Dav data and lock database. mkdir -p "/var/lib/dav/data"; \ - touch "/var/lib/dav/DavLock"; \ - chown -R www-data:www-data "/var/lib/dav"; \ + touch "/tmp/DavLock"; \ \ # Configure port sed -i -e "s|Listen .*|Listen 8080|" "conf/httpd.conf"; \ @@ -56,6 +55,6 @@ RUN set -ex; \ COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh -EXPOSE 8080/tcp 4430/tcp +EXPOSE 8080/tcp 8043/tcp ENTRYPOINT [ "docker-entrypoint.sh" ] CMD [ "httpd-foreground" ] diff --git a/2.4/conf/conf-available/dav.conf b/2.4/conf/conf-available/dav.conf index f88260d..bb0924c 100644 --- a/2.4/conf/conf-available/dav.conf +++ b/2.4/conf/conf-available/dav.conf @@ -1,4 +1,4 @@ -DavLockDB "/var/lib/dav/DavLock" +DavLockDB "/tmp/DavLock" Alias / "/var/lib/dav/data/" <Directory "/var/lib/dav/data/"> Dav On diff --git a/2.4/conf/sites-available/default-ssl.conf b/2.4/conf/sites-available/default-ssl.conf index 30cb498..9bdb3e1 100644 --- a/2.4/conf/sites-available/default-ssl.conf +++ b/2.4/conf/sites-available/default-ssl.conf @@ -1,5 +1,5 @@ -Listen 4430 -<VirtualHost *:4430> +Listen 8043 +<VirtualHost *:8043> Protocols h2 http/1.1 ServerName localhost DocumentRoot "/var/www/html/" diff --git a/2.4/docker-entrypoint.sh b/2.4/docker-entrypoint.sh index 4430d20..ca3048d 100755 --- a/2.4/docker-entrypoint.sh +++ b/2.4/docker-entrypoint.sh @@ -100,7 +100,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" +[ ! -e "/var/lib/dav/DavLock" ] && touch "/tmp/DavLock" exec "$@" |