From 11c5d11f1da7033ab3e3c0c1eb4442b57618a9cd Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Fri, 8 Jul 2016 13:46:02 -0700
Subject: [PATCH] Fix "AllowOverride" and "Indexes" defaults

---
 5.5/apache/Dockerfile     | 5 +++++
 5.6/apache/Dockerfile     | 5 +++++
 7.0/apache/Dockerfile     | 5 +++++
 apache-Dockerfile-block-1 | 5 +++++
 4 files changed, 20 insertions(+)

diff --git a/5.5/apache/Dockerfile b/5.5/apache/Dockerfile
index fa055bc6..3543f475 100644
--- a/5.5/apache/Dockerfile
+++ b/5.5/apache/Dockerfile
@@ -60,6 +60,11 @@ RUN { \
 		echo; \
 		echo 'DirectoryIndex disabled'; \
 		echo 'DirectoryIndex index.php index.html'; \
+		echo; \
+		echo '<Directory /var/www/>'; \
+		echo '\tOptions -Indexes'; \
+		echo '\tAllowOverride All'; \
+		echo '</Directory>'; \
 	} | tee "$APACHE_CONFDIR/conf-available/docker-php.conf" \
 	&& a2enconf docker-php
 
diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile
index 440868e5..7260d281 100644
--- a/5.6/apache/Dockerfile
+++ b/5.6/apache/Dockerfile
@@ -60,6 +60,11 @@ RUN { \
 		echo; \
 		echo 'DirectoryIndex disabled'; \
 		echo 'DirectoryIndex index.php index.html'; \
+		echo; \
+		echo '<Directory /var/www/>'; \
+		echo '\tOptions -Indexes'; \
+		echo '\tAllowOverride All'; \
+		echo '</Directory>'; \
 	} | tee "$APACHE_CONFDIR/conf-available/docker-php.conf" \
 	&& a2enconf docker-php
 
diff --git a/7.0/apache/Dockerfile b/7.0/apache/Dockerfile
index f1ebb5b4..b927781a 100644
--- a/7.0/apache/Dockerfile
+++ b/7.0/apache/Dockerfile
@@ -60,6 +60,11 @@ RUN { \
 		echo; \
 		echo 'DirectoryIndex disabled'; \
 		echo 'DirectoryIndex index.php index.html'; \
+		echo; \
+		echo '<Directory /var/www/>'; \
+		echo '\tOptions -Indexes'; \
+		echo '\tAllowOverride All'; \
+		echo '</Directory>'; \
 	} | tee "$APACHE_CONFDIR/conf-available/docker-php.conf" \
 	&& a2enconf docker-php
 
diff --git a/apache-Dockerfile-block-1 b/apache-Dockerfile-block-1
index e4c681d9..5ca40243 100644
--- a/apache-Dockerfile-block-1
+++ b/apache-Dockerfile-block-1
@@ -35,6 +35,11 @@ RUN { \
 		echo; \
 		echo 'DirectoryIndex disabled'; \
 		echo 'DirectoryIndex index.php index.html'; \
+		echo; \
+		echo '<Directory /var/www/>'; \
+		echo '\tOptions -Indexes'; \
+		echo '\tAllowOverride All'; \
+		echo '</Directory>'; \
 	} | tee "$APACHE_CONFDIR/conf-available/docker-php.conf" \
 	&& a2enconf docker-php