X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/752fbabf060f31db7de3f03d632bc047baba5087..bf16c782a9d8e78c4b14a35b899b81992f91155f:/cookbooks/munin/templates/default/apache.erb

diff --git a/cookbooks/munin/templates/default/apache.erb b/cookbooks/munin/templates/default/apache.erb
index 15c5009e6..77a215704 100644
--- a/cookbooks/munin/templates/default/apache.erb
+++ b/cookbooks/munin/templates/default/apache.erb
@@ -1,6 +1,6 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-<VirtualHost *:80>
+<VirtualHost *:443>
 	ServerName munin.openstreetmap.org
 	ServerAlias munin.osm.org
 	ServerAdmin webmaster@openstreetmap.org
@@ -8,7 +8,11 @@
 	CustomLog /var/log/apache2/munin.openstreetmap.org-access.log combined
 	ErrorLog /var/log/apache2/munin.openstreetmap.org-error.log
 
-	SetEnv RRDCACHED_ADDRESS /var/run/rrdcached.sock
+	SSLEngine on
+	SSLCertificateFile /etc/ssl/certs/munin.openstreetmap.org.pem
+	SSLCertificateKeyFile /etc/ssl/private/munin.openstreetmap.org.key
+
+        SetEnv RRDCACHED_ADDRESS /var/run/rrdcached.sock
 
 	DocumentRoot /srv/munin.openstreetmap.org
 	Alias /static/favicon.ico /srv/munin.openstreetmap.org/favicon.ico
@@ -20,13 +24,30 @@
 
 	RewriteEngine on
 	RewriteCond %{REQUEST_URI} !^/static/
+	RewriteCond %{REQUEST_URI} !^/dumps/
 	RewriteRule ^(/.*\.html)?$ /munin-cgi/munin-cgi-html/$1 [PT]
 </VirtualHost>
 
+<VirtualHost *:80>
+	ServerName munin.openstreetmap.org
+	ServerAlias munin.osm.org
+	ServerAdmin webmaster@openstreetmap.org
+
+	CustomLog /var/log/apache2/munin.openstreetmap.org-access.log combined
+	ErrorLog /var/log/apache2/munin.openstreetmap.org-error.log
+
+	RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+	RedirectPermanent / https://munin.openstreetmap.org/
+</VirtualHost>
+
 <Directory /srv/munin.openstreetmap.org>
 	Require all granted
 </Directory>
 
+<Directory /srv/munin.openstreetmap.org/dumps>
+	Options +Indexes
+</Directory>
+
 <Directory /etc/munin/static>
 	Require all granted
 </Directory>