From: Micah Anderson <micah@riseup.net>
Date: Fri, 3 Aug 2012 18:39:08 +0000 (-0400)
Subject: change location of control port in munin graphs, now that
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=5a1f664b66f62d2f75fb8ea8cee730aaf9097e84;p=puppet-tor.git

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 ac2630a..8504f89 100644
--- 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";
   }
 }