# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1606936214 0
# Node ID 957d7ddef6d09aa9df0edc795e5608ad24e75594
# Parent  f22809cba7afd1cb42aaee91dc497c0669fa69ea
Fix HTML-PHP serving

* /index.html meant all directories showed root index
* conf.extra/php.conf isn't the right PHP config
  and conf.d/php.conf already gets loaded

diff -r f22809cba7af -r 957d7ddef6d0 modules/website/files/conf.extra/html-php.conf
--- a/modules/website/files/conf.extra/html-php.conf	Sat Nov 07 14:33:17 2020 +0000
+++ b/modules/website/files/conf.extra/html-php.conf	Wed Dec 02 19:10:14 2020 +0000
@@ -1,6 +1,3 @@
-# Make sure we have PHP
-Include conf.extra/php.conf
-
 #
 # Cause the PHP interpreter to handle files with a .html extension.
 #
@@ -8,7 +5,7 @@
 	AddType text/html .html
 
 	#If we're doing HTML files as PHP then swap the priority for directory indexing
-	DirectoryIndex /index.html /index.php
+	DirectoryIndex index.html index.php
 
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteRule . /error.php [L]
diff -r f22809cba7af -r 957d7ddef6d0 modules/website/files/conf.extra/php.conf
--- a/modules/website/files/conf.extra/php.conf	Sat Nov 07 14:33:17 2020 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-DirectoryIndex /index.php /index.html
\ No newline at end of file