X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7f60aad6f04a069a4cd35b312292dbed16898c1d..a661370166bbac0bbe8c8b1f0ba947e3a269edee:/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 d5a2267d6..15c5009e6 100644
--- a/cookbooks/munin/templates/default/apache.erb
+++ b/cookbooks/munin/templates/default/apache.erb
@@ -8,17 +8,26 @@
 	CustomLog /var/log/apache2/munin.openstreetmap.org-access.log combined
 	ErrorLog /var/log/apache2/munin.openstreetmap.org-error.log
 
-	DocumentRoot /var/cache/munin/www
+	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} .html$ [or]
-	RewriteCond %{REQUEST_URI} =/
-	RewriteRule ^/(.*) /munin-cgi/munin-cgi-html/$1 [PT]
+	RewriteRule ^(/.*\.html)?$ /munin-cgi/munin-cgi-html/$1 [PT]
 </VirtualHost>
 
-<Directory /var/cache/munin/www>
+<Directory /srv/munin.openstreetmap.org>
+	Require all granted
+</Directory>
+
+<Directory /etc/munin/static>
 	Require all granted
 </Directory>