X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7b9ec4b60ee39614d1d083d7220e76b07d2b275f..157d98f404bf4fb5dcdf6752f807982aaf297261:/cookbooks/munin/templates/default/apache.erb

diff --git a/cookbooks/munin/templates/default/apache.erb b/cookbooks/munin/templates/default/apache.erb
index f3ce4e2c6..141d2a50f 100644
--- a/cookbooks/munin/templates/default/apache.erb
+++ b/cookbooks/munin/templates/default/apache.erb
@@ -8,9 +8,28 @@
 	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/
+
+	RewriteEngine on
+	RewriteCond %{REQUEST_URI} !^/static/
+	RewriteRule ^(/.*\.html)?$ /munin-cgi/munin-cgi-html/$1 [PT]
 </VirtualHost>
 
-<Directory /var/cache/munin/www>
-	Allow from all
+<Directory /srv/munin.openstreetmap.org>
+	Require all granted
+</Directory>
+
+<Directory /etc/munin/static>
+	Require all granted
+</Directory>
+
+<Directory /usr/lib/munin/cgi>
+	Options +ExecCGI
+	SetHandler fcgid-script
+	Require all granted
 </Directory>