change location of control port in munin graphs, now that

/usr/share/tor/tor-service-defaults-torrc exists and contains:

CookieAuthentication 1
CookieAuthFileGroupReadable 1
CookieAuthFile /var/run/tor/control.authcookie

diff --git a/manifests/munin.pp b/manifests/munin.pp
index ac2630a722b442a55e7e127101fa88fa7fb0e8c0..8504f8901fe0b6bef71ad9adbc4bff8b9a125a3e 100644 (file)
--- a/manifests/munin.pp
+++ b/manifests/munin.pp
@@ -17,7 +17,7 @@ class tor::munin {
   munin::plugin {
     [ "tor_connections", "tor_routers", "tor_traffic" ]:
       ensure => present,
-      config => "user debian-tor\n env.cookiefile /var/lib/tor/control_auth_cookie",
+      config => "user debian-tor\n env.cookiefile /var/run/tor/control.authcookie",
       script_path_in => "/usr/local/share/munin-plugins";
   }
 }