projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more hosters
[mirror/dsa-puppet.git]
/
modules
/
munin-node
/
manifests
/
init.pp
diff --git
a/modules/munin-node/manifests/init.pp
b/modules/munin-node/manifests/init.pp
index
6e2eb5e
..
05c6e19
100644
(file)
--- a/
modules/munin-node/manifests/init.pp
+++ b/
modules/munin-node/manifests/init.pp
@@
-1,4
+1,4
@@
-define activate_munin_check($ensure=present, script=$name) {
+define activate_munin_check($ensure=present,
$
script=$name) {
case $script {
"": { $base = $name }
default: { $base = $script }
case $script {
"": { $base = $name }
default: { $base = $script }
@@
-37,6
+37,7
@@
class munin-node {
"load":;
"memory":;
"ntp_offset":;
"load":;
"memory":;
"ntp_offset":;
+ "ntp_states":;
"open_files":;
"open_inodes":;
"processes":;
"open_files":;
"open_inodes":;
"processes":;
@@
-45,6
+46,12
@@
class munin-node {
"vmstat":;
}
"vmstat":;
}
+ case $spamd {
+ "true": {
+ activate_munin_check { "spamassassin":; }
+ }
+ }
+
file {
"/etc/munin/munin-node.conf":
source => [ "puppet:///munin-node/per-host/$fqdn/munin-node.conf",
file {
"/etc/munin/munin-node.conf":
source => [ "puppet:///munin-node/per-host/$fqdn/munin-node.conf",
@@
-53,8
+60,7
@@
class munin-node {
notify => Exec["munin-node restart"];
"/etc/munin/plugin-conf.d/munin-node":
notify => Exec["munin-node restart"];
"/etc/munin/plugin-conf.d/munin-node":
- source => [ "puppet:///munin-node/per-host/$fqdn/munin-node.plugin.conf",
- "puppet:///munin-node/common/munin-node.plugin.conf" ],
+ content => template("munin-node/munin-node.plugin.conf.erb"),
require => Package["munin-node"],
notify => Exec["munin-node restart"];
}
require => Package["munin-node"],
notify => Exec["munin-node restart"];
}