Bring piwik installation/upgrade under chef control

[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 5229358806911995ca10959103b53719f5098962..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
 
        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
        DocumentRoot /srv/piwik.openstreetmap.org

+       RedirectPermanent /index.php https://piwik.openstreetmap.org/index.php

 </VirtualHost>
 
 <VirtualHost *:443>
 </VirtualHost>
 
 <VirtualHost *:443>


@@ -24,5 +27,11 @@
        CustomLog /var/log/apache2/piwik.openstreetmap.org-access.log combined
        ErrorLog /var/log/apache2/piwik.openstreetmap.org-error.log
 
        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
 </VirtualHost>
        DocumentRoot /srv/piwik.openstreetmap.org
 </VirtualHost>

+
+<Directory /srv/piwik.openstreetmap.org>
+       Require all granted
+</Directory>