Merge pull request #110 from zerebubuth/munin-dump-fixes

[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 ecb4b4df4ee41b94e7496c701c6a962a73fc94b7..e59c33fb0943bd7387eabb168fd2a966c6fe3109 100644 (file)
--- a/cookbooks/munin/templates/default/apache.erb
+++ b/cookbooks/munin/templates/default/apache.erb
@@ -8,13 +8,19 @@
        CustomLog /var/log/apache2/munin.openstreetmap.org-access.log combined
        ErrorLog /var/log/apache2/munin.openstreetmap.org-error.log
 
+       SetEnv RRDCACHED_ADDRESS /var/run/rrdcached.sock
+
        DocumentRoot /srv/munin.openstreetmap.org
-        Alias /static/favicon.ico /srv/munin.openstreetmap.org/favicon.ico
+       Alias /static/favicon.ico /srv/munin.openstreetmap.org/favicon.ico
        Alias /static/ /etc/munin/static/
        ScriptAlias /munin-cgi/ /usr/lib/munin/cgi/
 
+       # Remove Proxy request header to mitigate https://httpoxy.org/
+       RequestHeader unset Proxy early
+
        RewriteEngine on
        RewriteCond %{REQUEST_URI} !^/static/
+       RewriteCond %{REQUEST_URI} !^/dumps/
        RewriteRule ^(/.*\.html)?$ /munin-cgi/munin-cgi-html/$1 [PT]
 </VirtualHost>
 
@@ -22,6 +28,10 @@
        Require all granted
 </Directory>
 
+<Directory /srv/munin.openstreetmap.org/dumps>
+       Options +Indexes
+</Directory>
+
 <Directory /etc/munin/static>
        Require all granted
 </Directory>