X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/18d192a0b455a06baa03b76f87f4e97cad6c1a3f..de5ea0729bd1f982f7fda34729d149d9a40766b9:/cookbooks/munin/templates/default/apache.erb

diff --git a/cookbooks/munin/templates/default/apache.erb b/cookbooks/munin/templates/default/apache.erb
index aaf8b5c90..e59c33fb0 100644
--- a/cookbooks/munin/templates/default/apache.erb
+++ b/cookbooks/munin/templates/default/apache.erb
@@ -8,14 +8,31 @@
 	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} !^/dumps/
 	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 /srv/munin.openstreetmap.org/dumps>
+	Options +Indexes
+</Directory>
+
+<Directory /etc/munin/static>
 	Require all granted
 </Directory>