summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2010-04-27 08:57:30 -0400
committerMicah Anderson <micah@riseup.net>2010-04-27 08:57:30 -0400
commit65a851a783b172542aacb4711fffc68a72f28589 (patch)
tree2d8c160d702ea2d3d2aa6b1c82fce2b685314736
parent8b8254af56943e761289d54d5c57fd942303f914 (diff)
better way to deploy munin plugins is to use the munin::plugin::deploy
-rw-r--r--manifests/init.pp22
1 files changed, 7 insertions, 15 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 62166e7..7d8d249 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -31,20 +31,12 @@ class passenger {
}
}
- file {
- "/usr/local/share/munin-plugins/passenger_mem":
- source => [ "puppet://$server/modules/site-passenger/munin/passenger_mem",
- "puppet://$server/modules/passenger/munin/passenger_mem" ],
- mode => 0755, owner => root, group => root;
-
- "/usr/local/share/munin-plugins/passenger_stats":
- source => [ "puppet://$server/modules/site-passenger/munin/passenger_stats",
- "puppet://$server/modules/passenger/munin/passenger_stats" ],
- mode => 0755, owner => root, group => root;
- }
-
- munin::plugin { [ passenger_mem, passenger_stats ]:
- config => "user root",
- script_path_in => "/usr/local/share/munin-plugins";
+ munin::plugin::deploy {
+ 'passenger_mem':
+ source => "passenger/munin/passenger_mem",
+ config => "user root";
+ 'passenger_stats':
+ source => "passenger/munin/passenger_stats",
+ config => "user root";
}
}