manage a dedicated control port for munin

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 000c959d22d4f952d141628803eb5a56ef28ab41..24401804a3712e66141f0041f5ca2bd7ec5e788b 100644 (file)
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -11,8 +11,11 @@ class tor::daemon (
 
   class{'tor':
     ensure_version => $ensure_version,
-    use_munin      => $use_munin,
   }
 
   include tor::daemon::base
+
+  if $use_munin {
+    include tor::munin
+  }
 }

diff --git a/manifests/init.pp b/manifests/init.pp
index 3653c896b77af695284e22cab079e30c204847ee..c6e4e04c2ebf7b58d87434c8c3c51dfa50e5aa51 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,12 +1,7 @@
 # manage a basic tor installation
 class tor (
   $ensure_version = 'installed',
-  $use_munin      = false
 ){
 
   include tor::base
-
-  if $use_munin {
-    include tor::munin
-  }
 }

diff --git a/manifests/munin.pp b/manifests/munin.pp
index e1b369ae82e2ac72155eca92bf6d7402a6f8f507..4412337a7a4d233018671c2d4aaad8daa0e3abaa 100644 (file)
--- a/manifests/munin.pp
+++ b/manifests/munin.pp
@@ -1,7 +1,14 @@
 # munin plugins for puppet
 class tor::munin {
+  tor::daemon::control{
+    'control_port_for_munin':
+      port                  => 19051,
+      cookie_authentication => 1,
+      cookie_auth_file      => '/var/run/tor/control.authcookie',
+  }
+
   Munin::Plugin::Deploy {
-    config  => "user debian-tor\n env.cookiefile /var/run/tor/control.authcookie"
+    config  => "user debian-tor\n env.cookiefile /var/run/tor/control.authcookie\n env.port 19051"
   }
   munin::plugin::deploy {
     'tor_connections':