Drop memache configuration for gpx-import

[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 42aae8254076a47c72b03ab5346200b11aea935b..226a3211e9888a142e964f02897439405ae387d6 100644 (file)
--- a/cookbooks/piwik/templates/default/apache.erb
+++ b/cookbooks/piwik/templates/default/apache.erb
@@ -8,6 +8,8 @@
        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
        RedirectPermanent /index.php https://piwik.openstreetmap.org/index.php
 </VirtualHost>
        DocumentRoot /srv/piwik.openstreetmap.org
        RedirectPermanent /index.php https://piwik.openstreetmap.org/index.php
 </VirtualHost>


@@ -17,14 +19,15 @@
        ServerAdmin webmaster@openstreetmap.org
 
        SSLEngine on
        ServerAdmin webmaster@openstreetmap.org
 
        SSLEngine on

-       SSLProtocol all -SSLv2
-       SSLCipherSuite ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW
-       SSLCertificateFile /etc/ssl/certs/openstreetmap.pem
-       SSLCertificateKeyFile /etc/ssl/private/openstreetmap.key

 
        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
 

-       DocumentRoot /srv/piwik.openstreetmap.org

        Options -Indexes
        Options -Indexes

+
+       DocumentRoot /srv/piwik.openstreetmap.org

 </VirtualHost>
 </VirtualHost>

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