Mercurial > repos > other > Puppet

changeset 10:440ea809487c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add missing php.conf and make html-php config try index.html first as index
author IBBoard <dev@ibboard.co.uk>
date Sat, 08 Nov 2014 15:35:38 +0000
parents ca6ce30c0bfc
children 4b42f65ae875
files modules/website/files/conf.extra/html-php.conf modules/website/files/conf.extra/php.conf
diffstat 2 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/modules/website/files/conf.extra/html-php.conf	Mon Oct 27 20:31:27 2014 +0000
+++ b/modules/website/files/conf.extra/html-php.conf	Sat Nov 08 15:35:38 2014 +0000
@@ -5,3 +5,6 @@
 #
 AddHandler php5-script .html
 AddType text/html .html
+
+#If we're doing HTML files as PHP then swap the priority for directory indexing
+DirectoryIndex index.html index.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/website/files/conf.extra/php.conf	Sat Nov 08 15:35:38 2014 +0000
@@ -0,0 +1,1 @@
+DirectoryIndex index.php index.html
\ No newline at end of file