From 04fc9123aad9fcf4a9f972f6f2ab03d1bad019c3 Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Wed, 21 Aug 2019 05:13:03 +0200
Subject: Install apache-webdav module
---
2.4/Dockerfile | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
(limited to '2.4/Dockerfile')
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; \
--
cgit v1.2.3