diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2019-08-21 05:13:03 +0200 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2019-08-21 05:13:03 +0200 |
| commit | 04fc9123aad9fcf4a9f972f6f2ab03d1bad019c3 (patch) | |
| tree | 5dbf97e4f053483b263770f111eeffba3851b70d /2.4 | |
| parent | a480676c656470c7a2fcf7390a687f61a3d76470 (diff) | |
| download | apache-master.tar.gz apache-master.tar.bz2 apache-master.tar.xz apache-master.zip | |
Diffstat (limited to '2.4')
| -rw-r--r-- | 2.4/Dockerfile | 14 | ||||
| -rw-r--r-- | 2.4/conf/conf-available/dav.conf | 1 |
2 files changed, 9 insertions, 6 deletions
diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 23cea7e..caadea1 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -13,6 +13,9 @@ COPY docker-entrypoint.sh /docker-entrypoint.sh RUN set -ex; \ # Install packages packages="${EXTRA_PACKAGES} apache2 libxml2-dev apache2-utils apr-util-dbm_db"; \ + if [ ${ENABLE_DAV} -ne 0 ]; then \ + packages="$packages apache2-webdav"; \ + fi; \ if [ ${ENABLE_PHP} -ne 0 ]; then \ packages="$packages php7-apache2"; \ fi; \ @@ -58,11 +61,12 @@ RUN set -ex; \ done; \ \ # Remove extra configs - #rm /etc/apache2/conf.d/default.conf; \ - rm /etc/apache2/conf.d/info.conf; \ - rm /etc/apache2/conf.d/languages.conf; \ - #rm /etc/apache2/conf.d/mpm.conf; \ - rm /etc/apache2/conf.d/userdir.conf; \ + rm -f /etc/apache2/conf.d/dav.conf; \ + #rm -f /etc/apache2/conf.d/default.conf; \ + rm -f /etc/apache2/conf.d/info.conf; \ + rm -f /etc/apache2/conf.d/languages.conf; \ + #rm -f /etc/apache2/conf.d/mpm.conf; \ + rm -f /etc/apache2/conf.d/userdir.conf; \ \ # Allow scripts to alter configuration chmod -R g=u /tmp/conf; \ diff --git a/2.4/conf/conf-available/dav.conf b/2.4/conf/conf-available/dav.conf index 9ef2d16..2c88747 100644 --- a/2.4/conf/conf-available/dav.conf +++ b/2.4/conf/conf-available/dav.conf @@ -1,6 +1,5 @@ LoadModule dav_module modules/mod_dav.so LoadModule dav_fs_module modules/mod_dav_fs.so -LoadModule dav_lock_module modules/mod_dav_lock.so DavLockDB "/tmp/DavLock" Alias / "/var/dav/data/" |