Mercurial > repos > other > Puppet
changeset 366:957d7ddef6d0
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
| author | IBBoard <dev@ibboard.co.uk> |
|---|---|
| date | Wed, 02 Dec 2020 19:10:14 +0000 |
| parents | f22809cba7af |
| children | bcb54d9853e1 |
| files | modules/website/files/conf.extra/html-php.conf modules/website/files/conf.extra/php.conf |
| diffstat | 2 files changed, 1 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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]