X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/60ef68d5a680e8198874299a1685cb72430b9b49..de5ea0729bd1f982f7fda34729d149d9a40766b9:/cookbooks/munin/templates/default/apache.erb
diff --git a/cookbooks/munin/templates/default/apache.erb b/cookbooks/munin/templates/default/apache.erb
index ecb4b4df4..e59c33fb0 100644
--- 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]
@@ -22,6 +28,10 @@
Require all granted
+
+ Options +Indexes
+
+
Require all granted