Munin add static + root support to rewrite

[chef.git] / cookbooks / munin / templates / default / apache.erb

diff --git a/cookbooks/munin/templates/default/apache.erb b/cookbooks/munin/templates/default/apache.erb
index f3ce4e2c694fd941c1950a65adea33255fc4ab46..d5a2267d61c47f0e966247b1249279048d4a0431 100644 (file)
--- 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>