From f6c40011c82d45eba771576191550f5fa8a96608 Mon Sep 17 00:00:00 2001 From: Jens Erat Date: Wed, 25 Mar 2015 14:48:54 +0100 Subject: [PATCH] Empty config and sites folders, include them (#76) --- 5.4/apache/apache2.conf | 3 +++ 5.5/apache/apache2.conf | 3 +++ 5.6/apache/apache2.conf | 3 +++ apache-Dockerfile-block-1 | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/5.4/apache/apache2.conf b/5.4/apache/apache2.conf index 0a228363..ab5b2648 100644 --- a/5.4/apache/apache2.conf +++ b/5.4/apache/apache2.conf @@ -59,3 +59,6 @@ CustomLog /proc/self/fd/1 combined # https://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex DirectoryIndex disabled DirectoryIndex index.php index.html + +IncludeOptional conf-enabled/*.conf +IncludeOptional sites-enabled/*.conf diff --git a/5.5/apache/apache2.conf b/5.5/apache/apache2.conf index 0a228363..ab5b2648 100644 --- a/5.5/apache/apache2.conf +++ b/5.5/apache/apache2.conf @@ -59,3 +59,6 @@ CustomLog /proc/self/fd/1 combined # https://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex DirectoryIndex disabled DirectoryIndex index.php index.html + +IncludeOptional conf-enabled/*.conf +IncludeOptional sites-enabled/*.conf diff --git a/5.6/apache/apache2.conf b/5.6/apache/apache2.conf index 0a228363..ab5b2648 100644 --- a/5.6/apache/apache2.conf +++ b/5.6/apache/apache2.conf @@ -59,3 +59,6 @@ CustomLog /proc/self/fd/1 combined # https://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex DirectoryIndex disabled DirectoryIndex index.php index.html + +IncludeOptional conf-enabled/*.conf +IncludeOptional sites-enabled/*.conf diff --git a/apache-Dockerfile-block-1 b/apache-Dockerfile-block-1 index ed8264c1..2d53bf9e 100644 --- a/apache-Dockerfile-block-1 +++ b/apache-Dockerfile-block-1 @@ -5,7 +5,7 @@ RUN rm -rf /var/www/html && mkdir -p /var/lock/apache2 /var/run/apache2 /var/log # Apache + PHP requires preforking Apache for best results RUN a2dismod mpm_event && a2enmod mpm_prefork -RUN mv /etc/apache2/apache2.conf /etc/apache2/apache2.conf.dist +RUN mv /etc/apache2/apache2.conf /etc/apache2/apache2.conf.dist && rm /etc/apache2/{conf,sites}-enabled/* COPY apache2.conf /etc/apache2/apache2.conf # it'd be nice if we could not COPY apache2.conf until the end of the Dockerfile, but its contents are checked by PHP during compilation