From: Stephen Gran <steve@lobefin.net>
Date: Fri, 16 Oct 2009 20:26:31 +0000 (+0100)
Subject: munin-node stuff for apache
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=48488d09556d7c30a3d1eb0e7298cf430e45405b;p=dsa-puppet.git

munin-node stuff for apache

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 8a5684cc..e1eaf300 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -3,6 +3,8 @@ define enable_module($module) {
 }
 
 class apache2 {
+        include munin-node::apache
+
 	package {
 		apache2: ensure => installed;
 		logrotate: ensure => installed;
diff --git a/modules/munin-node/manifests/apache.pp b/modules/munin-node/manifests/apache.pp
new file mode 100644
index 00000000..47ccba17
--- /dev/null
+++ b/modules/munin-node/manifests/apache.pp
@@ -0,0 +1,6 @@
+class munin-node::apache {
+        activate_munin_check("apache_accesses");
+        activate_munin_check("apache_processes");
+        activate_munin_check("apache_volume");
+}
+
diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 5870a223..f09f8fc6 100644
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -1,3 +1,10 @@
+define activate_munin_check($script) {
+       file { "/etc/munin/plugins/$script":
+                ensure => "/usr/share/munin/plugins/$script"
+                notify => Exec["munin-node restart"];
+        }
+}
+
 class munin-node {
 
     package { munin-node: ensure => installed }