Switch to generating munin graphs on demand

[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 59598acabf3fedb2ff4a0efab68b5591c9ee1c3d..aaf8b5c909664b18e4c19c01c858b3d09f96f227 100644 (file)
--- a/cookbooks/munin/templates/default/apache.erb
+++ b/cookbooks/munin/templates/default/apache.erb
@@ -9,8 +9,18 @@
        ErrorLog /var/log/apache2/munin.openstreetmap.org-error.log
 
        DocumentRoot /var/cache/munin/www
+       ScriptAlias /munin-cgi/ /usr/lib/munin/cgi/
+
+       RewriteEngine on
+       RewriteRule ^(/.*\.html)?$ /munin-cgi/munin-cgi-html/$1 [PT]
 </VirtualHost>
 
 <Directory /var/cache/munin/www>
        Require all granted
 </Directory>
+
+<Directory /usr/lib/munin/cgi>
+       Options +ExecCGI
+       SetHandler fcgid-script
+       Require all granted
+</Directory>