X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/37eda569bbcd164adb05e78d23fc0221a8e96c56..70c9fb3921e6f0c95828d52f3538cde194cc3414:/cookbooks/munin/templates/default/apache.erb?ds=sidebyside diff --git a/cookbooks/munin/templates/default/apache.erb b/cookbooks/munin/templates/default/apache.erb index 59598acab..77a215704 100644 --- a/cookbooks/munin/templates/default/apache.erb +++ b/cookbooks/munin/templates/default/apache.erb @@ -1,5 +1,33 @@ # DO NOT EDIT - This file is being maintained by Chef + + 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 + + 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 + Alias /static/ /etc/munin/static/ + ScriptAlias /munin-cgi/ /usr/lib/munin/cgi/ + + # Remove Proxy request header to mitigate https://httpoxy.org/ + RequestHeader unset Proxy early + + RewriteEngine on + RewriteCond %{REQUEST_URI} !^/static/ + RewriteCond %{REQUEST_URI} !^/dumps/ + RewriteRule ^(/.*\.html)?$ /munin-cgi/munin-cgi-html/$1 [PT] + + ServerName munin.openstreetmap.org ServerAlias munin.osm.org @@ -8,9 +36,24 @@ CustomLog /var/log/apache2/munin.openstreetmap.org-access.log combined ErrorLog /var/log/apache2/munin.openstreetmap.org-error.log - DocumentRoot /var/cache/munin/www + RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ + RedirectPermanent / https://munin.openstreetmap.org/ - + + Require all granted + + + + Options +Indexes + + + + Require all granted + + + + Options +ExecCGI + SetHandler fcgid-script Require all granted