Make sure munin-cgi-graph uses rrdcached

diff --git a/cookbooks/munin/templates/default/apache.erb b/cookbooks/munin/templates/default/apache.erb
index ecb4b4df4ee41b94e7496c701c6a962a73fc94b7..141d2a50f50c58e09fb7ed464c80ad47ef190f8e 100644 (file)
--- 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
 
        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
        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/
 
        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 f89b91ae1822f5b59c957bcb484a7cfc5c731ddd..72f9e6fcce381d1a95884025d9d2f47524fffa0c 100644 (file)
--- 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 <pidfile> - this is handled by the init script)
 # default: see /etc/init.d/rrdcached
 # options to be passed to rrdcached
 # (do not specify -p <pidfile> - 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;
 
 # number of seconds to wait for rrdcached to shut down
 # (writing the data to disk may take some time;