From 60ef68d5a680e8198874299a1685cb72430b9b49 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 16 Mar 2015 09:16:19 +0000 Subject: [PATCH] Tidy up munin www config --- cookbooks/munin/files/default/www/favicon.ico | Bin 0 -> 15086 bytes cookbooks/munin/recipes/server.rb | 11 +++++++++++ cookbooks/munin/templates/default/apache.erb | 14 +++++++++----- 3 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 cookbooks/munin/files/default/www/favicon.ico diff --git a/cookbooks/munin/files/default/www/favicon.ico b/cookbooks/munin/files/default/www/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..975e1cb0d9a56a11d5843a5bc851bd8ed2f6b0ca GIT binary patch literal 15086 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�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 literal 0 HcmV?d00001 diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb index 8d9759960..4729f4321 100644 --- a/cookbooks/munin/recipes/server.rb +++ b/cookbooks/munin/recipes/server.rb @@ -66,6 +66,17 @@ end apache_module "fcgid" apache_module "rewrite" +remote_directory "/srv/munin.openstreetmap.org" do + source "www" + owner "root" + group "root" + mode 0755 + files_owner "root" + files_group "root" + files_mode 0755 + purge true +end + apache_site "munin.openstreetmap.org" do template "apache.erb" end diff --git a/cookbooks/munin/templates/default/apache.erb b/cookbooks/munin/templates/default/apache.erb index d5a2267d6..ecb4b4df4 100644 --- a/cookbooks/munin/templates/default/apache.erb +++ b/cookbooks/munin/templates/default/apache.erb @@ -8,17 +8,21 @@ CustomLog /var/log/apache2/munin.openstreetmap.org-access.log combined ErrorLog /var/log/apache2/munin.openstreetmap.org-error.log - DocumentRoot /var/cache/munin/www + DocumentRoot /srv/munin.openstreetmap.org + Alias /static/favicon.ico /srv/munin.openstreetmap.org/favicon.ico + Alias /static/ /etc/munin/static/ 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] + RewriteRule ^(/.*\.html)?$ /munin-cgi/munin-cgi-html/$1 [PT] - + + Require all granted + + + Require all granted -- 2.43.2