Update piwik to apache 2.4 style access controls

[chef.git] / cookbooks / piwik / templates / default / apache.erb

diff --git a/cookbooks/piwik/templates/default/apache.erb b/cookbooks/piwik/templates/default/apache.erb
index 8744c8e892ffffdf4dc2e24b79de8f6cbf2afb1f..8b7f375c69823ceb40e9d0c3be88b6f51ed0f4f9 100644 (file)
--- a/cookbooks/piwik/templates/default/apache.erb
+++ b/cookbooks/piwik/templates/default/apache.erb
@@ -8,7 +8,10 @@
        CustomLog /var/log/apache2/piwik.openstreetmap.org-access.log combined
        ErrorLog /var/log/apache2/piwik.openstreetmap.org-error.log
 
+       Options -Indexes
+
        DocumentRoot /srv/piwik.openstreetmap.org
+       RedirectPermanent /index.php https://piwik.openstreetmap.org/index.php
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -24,6 +27,11 @@
        CustomLog /var/log/apache2/piwik.openstreetmap.org-access.log combined
        ErrorLog /var/log/apache2/piwik.openstreetmap.org-error.log
 
-       DocumentRoot /srv/piwik.openstreetmap.org
        Options -Indexes
+
+       DocumentRoot /srv/piwik.openstreetmap.org
 </VirtualHost>
+
+<Directory /srv/piwik.openstreetmap.org>
+       Require all granted
+</Directory>