From: Grant Slater <git@firefishy.com>
Date: Mon, 16 Mar 2015 00:25:03 +0000 (+0000)
Subject: Munin add static + root support to rewrite
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/7f60aad6f04a069a4cd35b312292dbed16898c1d?ds=sidebyside

Munin add static + root support to rewrite
---

diff --git a/cookbooks/munin/templates/default/apache.erb b/cookbooks/munin/templates/default/apache.erb
index aaf8b5c90..d5a2267d6 100644
--- a/cookbooks/munin/templates/default/apache.erb
+++ b/cookbooks/munin/templates/default/apache.erb
@@ -12,7 +12,10 @@
 	ScriptAlias /munin-cgi/ /usr/lib/munin/cgi/
 
 	RewriteEngine on
-	RewriteRule ^(/.*\.html)?$ /munin-cgi/munin-cgi-html/$1 [PT]
+	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>