Handle server_url being commented out in the example configuration

[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..8f27414ba3f69629d00469c1ded2d1538a20ef99 100644 (file)
--- a/cookbooks/piwik/templates/default/apache.erb
+++ b/cookbooks/piwik/templates/default/apache.erb
@@ -1,30 +1,34 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # DO NOT EDIT - This file is being maintained by Chef
 

-<VirtualHost *:80>
+<VirtualHost *:443>

        ServerName piwik.openstreetmap.org
        ServerAlias piwik.osm.org
        ServerAdmin webmaster@openstreetmap.org
 
        ServerName piwik.openstreetmap.org
        ServerAlias piwik.osm.org
        ServerAdmin webmaster@openstreetmap.org
 

+       SSLEngine on
+       SSLCertificateFile /etc/ssl/certs/piwik.openstreetmap.org.pem
+       SSLCertificateKeyFile /etc/ssl/private/piwik.openstreetmap.org.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
 

+       Options -Indexes
+

        DocumentRoot /srv/piwik.openstreetmap.org
        DocumentRoot /srv/piwik.openstreetmap.org

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

 </VirtualHost>
 
 </VirtualHost>
 

-<VirtualHost *:443>
+<VirtualHost *:80>

        ServerName piwik.openstreetmap.org
        ServerName piwik.openstreetmap.org

+       ServerAlias piwik.osm.org

        ServerAdmin webmaster@openstreetmap.org
 
        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
+       RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+       RedirectPermanent / https://piwik.openstreetmap.org/

 </VirtualHost>
 </VirtualHost>

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