From 26c853a923b21fbb599f9951409e053e18ee465b Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 17 Mar 2015 00:29:19 +0000 Subject: [PATCH] Make sure munin-cgi-graph uses rrdcached --- cookbooks/munin/templates/default/apache.erb | 4 +++- cookbooks/munin/templates/default/rrdcached.erb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cookbooks/munin/templates/default/apache.erb b/cookbooks/munin/templates/default/apache.erb index ecb4b4df4..141d2a50f 100644 --- a/cookbooks/munin/templates/default/apache.erb +++ b/cookbooks/munin/templates/default/apache.erb @@ -8,8 +8,10 @@ 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/ diff --git a/cookbooks/munin/templates/default/rrdcached.erb b/cookbooks/munin/templates/default/rrdcached.erb index f89b91ae1..72f9e6fcc 100644 --- a/cookbooks/munin/templates/default/rrdcached.erb +++ b/cookbooks/munin/templates/default/rrdcached.erb @@ -7,7 +7,7 @@ DISABLE=0 # options to be passed to rrdcached # (do not specify -p - this is handled by the init script) # default: see /etc/init.d/rrdcached -OPTS="-s munin -m 660 -l unix:/var/run/rrdcached.sock -w 1800 -z 1800 -j /var/lib/munin/rrdcached -F -b /var/lib/munin -B" +OPTS="-s munin -m 666 -l unix:/var/run/rrdcached.sock -w 1800 -z 1800 -j /var/lib/munin/rrdcached -F -b /var/lib/munin -B" # number of seconds to wait for rrdcached to shut down # (writing the data to disk may take some time; -- 2.39.5