danog/php
1
0
Fork 0
mirror of https://github.com/danog/php.git synced 2025-01-21 12:37:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Empty config and sites folders, include them (#76)

Browse Source
This commit is contained in:
Jens Erat 2015-03-25 14:48:54 +01:00
parent dd4503a7f0
commit f6c40011c8
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
5.4/apache/apache2.conf
View File

@ -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

3
5.5/apache/apache2.conf
View File

@ -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

3
5.6/apache/apache2.conf
View File

@ -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

2
apache-Dockerfile-block-1
View File

@ -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