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

diff --git a/cookbooks/munin/templates/default/apache.erb b/cookbooks/munin/templates/default/apache.erb
index f3ce4e2c6..d5a2267d6 100644
--- a/cookbooks/munin/templates/default/apache.erb
+++ b/cookbooks/munin/templates/default/apache.erb
@@ -9,8 +9,21 @@
 	ErrorLog /var/log/apache2/munin.openstreetmap.org-error.log
 
 	DocumentRoot /var/cache/munin/www
+	ScriptAlias /munin-cgi/ /usr/lib/munin/cgi/
+
+	RewriteEngine on
+	RewriteCond %{REQUEST_URI} !^/static/
+	RewriteCond %{REQUEST_URI} .html$ [or]
+	RewriteCond %{REQUEST_URI} =/
+	RewriteRule ^/(.*) /munin-cgi/munin-cgi-html/$1 [PT]
 </VirtualHost>
 
 <Directory /var/cache/munin/www>
-	Allow from all
+	Require all granted
+</Directory>
+
+<Directory /usr/lib/munin/cgi>
+	Options +ExecCGI
+	SetHandler fcgid-script
+	Require all granted
 </Directory>