diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-20 23:09:20 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-20 23:09:20 -0200 |
| commit | f252115be193d58d345b7d18228800c68a1e47aa (patch) | |
| tree | 31c95ada21d54314ecb1650f2b19e8540386dd62 /manifests/munin.pp | |
| parent | 89d3242cc7d4607f5eb8f1df39985c3597ee428d (diff) | |
| parent | a780e84001177f10a86a7bf824589c0553f513a0 (diff) | |
| download | puppet-tor-f252115be193d58d345b7d18228800c68a1e47aa.tar.gz puppet-tor-f252115be193d58d345b7d18228800c68a1e47aa.tar.bz2 | |
Merge branch 'master' of ssh://labs.riseup.net/shared-tor
Conflicts:
manifests/daemon.pp
Diffstat (limited to 'manifests/munin.pp')
| -rw-r--r-- | manifests/munin.pp | 34 |
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'; } } |