aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-06-05 15:55:15 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-06-05 15:55:15 -0300
commit2ef200c670d58681ba16f7a530d4c6b5f416092b (patch)
tree0a2c5322cfc9fa9484dc5227c7d4ab02037afdba
parent2f41b9eaf6275d6d222efec626ba41edf0e76332 (diff)
downloadpuppet-nodo-2ef200c670d58681ba16f7a530d4c6b5f416092b.tar.gz
puppet-nodo-2ef200c670d58681ba16f7a530d4c6b5f416092b.tar.bz2
More munin plugins
-rw-r--r--manifests/role/mail.pp5
-rw-r--r--manifests/role/proxy.pp5
-rw-r--r--manifests/subsystem/mail.pp8
3 files changed, 17 insertions, 1 deletions
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 255588a..03e7262 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -1,3 +1,8 @@
class nodo::role::mail {
class { [ 'nodo::role::vserver', 'mail::system' ]: }
+
+ # Graph postfix
+ munin::plugin { [ 'postfix_mailqueue', 'postfix_mailstats', 'postfix_mailvolume' ]:
+ ensure => present,
+ }
}
diff --git a/manifests/role/proxy.pp b/manifests/role/proxy.pp
index 7852bef..5af7f5b 100644
--- a/manifests/role/proxy.pp
+++ b/manifests/role/proxy.pp
@@ -1,3 +1,8 @@
class nodo::role::proxy inherits nodo::base::vserver {
include nginx
+
+ # Graph nginx
+ munin::plugin { [ 'nginx_request', 'nginx_status' ]:
+ ensure => present,
+ }
}
diff --git a/manifests/subsystem/mail.pp b/manifests/subsystem/mail.pp
index 12c7e4b..dfd296b 100644
--- a/manifests/subsystem/mail.pp
+++ b/manifests/subsystem/mail.pp
@@ -9,6 +9,12 @@ class nodo::subsystem::mail {
}
}
'postfix': { }
- '','exim',default: { include exim::tls }
+ '','exim',default: {
+ include exim::tls
+
+ #munin::plugin { [ 'exim_mailqueue', 'exim_mailstats' ]:
+ # ensure => present,
+ #}
+ }
}
}