X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/98bf92d3bed438d3835333b34b7f68ad24869fc8..de2bf98ad0027fa787099371bcfe2816e26a51a7:/cookbooks/piwik/templates/default/apache.erb

diff --git a/cookbooks/piwik/templates/default/apache.erb b/cookbooks/piwik/templates/default/apache.erb
index 8744c8e89..8f27414ba 100644
--- a/cookbooks/piwik/templates/default/apache.erb
+++ b/cookbooks/piwik/templates/default/apache.erb
@@ -1,29 +1,34 @@
 # 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
 
+	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
 
+	Options -Indexes
+
 	DocumentRoot /srv/piwik.openstreetmap.org
 </VirtualHost>
 
-<VirtualHost *:443>
+<VirtualHost *:80>
 	ServerName piwik.openstreetmap.org
+	ServerAlias piwik.osm.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
 
-	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>
+
+<Directory /srv/piwik.openstreetmap.org>
+	Require all granted
+</Directory>