Merge pull request #43 from infosiftr/just-php

Make the root more obvious, fix DirectoryIndex to php first

Author: tianon

5.4/apache/apache2.conf

@@ -36,6 +36,8 @@ Listen 80
 	Require all granted
 </Directory>
 
+DocumentRoot /var/www/html
+
 AccessFileName .htaccess
 <FilesMatch "^\.ht">
 	Require all denied
@@ -52,6 +54,9 @@ CustomLog /proc/self/fd/1 combined
 <FilesMatch \.php$>
 	SetHandler application/x-httpd-php
 </FilesMatch>
-DirectoryIndex index.php
 
-DocumentRoot /var/www/html
+# Multiple DirectoryIndex directives within the same context will add
+# to the list of resources to look for rather than replace
+# https://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex
+DirectoryIndex disabled
+DirectoryIndex index.php index.html

5.5/apache/apache2.conf

@@ -36,6 +36,8 @@ Listen 80
 	Require all granted
 </Directory>
 
+DocumentRoot /var/www/html
+
 AccessFileName .htaccess
 <FilesMatch "^\.ht">
 	Require all denied
@@ -52,6 +54,9 @@ CustomLog /proc/self/fd/1 combined
 <FilesMatch \.php$>
 	SetHandler application/x-httpd-php
 </FilesMatch>
-DirectoryIndex index.php
 
-DocumentRoot /var/www/html
+# Multiple DirectoryIndex directives within the same context will add
+# to the list of resources to look for rather than replace
+# https://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex
+DirectoryIndex disabled
+DirectoryIndex index.php index.html

5.6/apache/apache2.conf

@@ -36,6 +36,8 @@ Listen 80
 	Require all granted
 </Directory>
 
+DocumentRoot /var/www/html
+
 AccessFileName .htaccess
 <FilesMatch "^\.ht">
 	Require all denied
@@ -52,6 +54,9 @@ CustomLog /proc/self/fd/1 combined
 <FilesMatch \.php$>
 	SetHandler application/x-httpd-php
 </FilesMatch>
-DirectoryIndex index.php
 
-DocumentRoot /var/www/html
+# Multiple DirectoryIndex directives within the same context will add
+# to the list of resources to look for rather than replace
+# https://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex
+DirectoryIndex disabled
+DirectoryIndex index.php index.html

apache2.conf

@@ -36,6 +36,8 @@ Listen 80
 	Require all granted
 </Directory>
 
+DocumentRoot /var/www/html
+
 AccessFileName .htaccess
 <FilesMatch "^\.ht">
 	Require all denied
@@ -52,6 +54,9 @@ CustomLog /proc/self/fd/1 combined
 <FilesMatch \.php$>
 	SetHandler application/x-httpd-php
 </FilesMatch>
-DirectoryIndex index.php
 
-DocumentRoot /var/www/html
+# Multiple DirectoryIndex directives within the same context will add
+# to the list of resources to look for rather than replace
+# https://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex
+DirectoryIndex disabled
+DirectoryIndex index.php index.html