Don't try and restart passenger on machines that don't have it

[chef.git] / cookbooks / munin / templates / default / apache.erb

diff --git a/cookbooks/munin/templates/default/apache.erb b/cookbooks/munin/templates/default/apache.erb
index e59c33fb0943bd7387eabb168fd2a966c6fe3109..77a215704ca22b3a590bec549d322a907ec9d09e 100644 (file)
--- 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
@@ -24,6 +28,18 @@
        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>