1 files changed, 16 insertions, 18 deletions
diff --git a/manifests/munin.pp b/manifests/munin.pp
index ac2630a..4412337 100644
--- a/manifests/munin.pp
+++ b/manifests/munin.pp
@@ -1,23 +1,21 @@
+# munin plugins for puppet
 class tor::munin {
-
-  file {
-    "/usr/local/share/munin-plugins/tor_connections":
-      source => "puppet:///modules/tor/munin/tor_connections",
-      mode => 0755, owner => root, group => root;
-    
-    "/usr/local/share/munin-plugins/tor_routers":
-      source => "puppet:///modules/tor/munin/tor_routers",
-      mode => 0755, owner => root, group => root;
-
-    "/usr/local/share/munin-plugins/tor_traffic":
-      source => "puppet:///modules/tor/munin/tor_traffic",
-      mode => 0755, owner => root, group => root;
+  tor::daemon::control{
+    'control_port_for_munin':
+      port                  => 19051,
+      cookie_authentication => 1,
+      cookie_auth_file      => '/var/run/tor/control.authcookie',
   }
 
-  munin::plugin {
-    [ "tor_connections", "tor_routers", "tor_traffic" ]:
-      ensure => present,
-      config => "user debian-tor\n env.cookiefile /var/lib/tor/control_auth_cookie",
-      script_path_in => "/usr/local/share/munin-plugins";
+  Munin::Plugin::Deploy {
+    config  => "user debian-tor\n env.cookiefile /var/run/tor/control.authcookie\n env.port 19051"
+  }
+  munin::plugin::deploy {
+    'tor_connections':
+      source => 'tor/munin/tor_connections';
+    'tor_routers':
+      source => 'tor/munin/tor_routers';
+    'tor_traffic':
+      source => 'tor/munin/tor_traffic';
   }
 }