From: Stephen Gran <steve@lobefin.net>
Date: Sun, 7 Mar 2010 11:57:04 +0000 (+0000)
Subject: get rid of way too many munin subclasses
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=cab61105c047ee9d4f521b65eaebf1e0f6e9e736;p=mirror%2Fdsa-puppet.git

get rid of way too many munin subclasses

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 519fa208e..d75b970e3 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,5 +1,11 @@
 class apache2 {
-        include munin-node::apache
+        activate_munin_check {
+                "apache_accesses":;
+                "apache_processes":;
+                "apache_volume":;
+                "apache_servers":;
+                "ps_apache2": script => "ps_";
+        }
 
 	package {
 		"apache2": ensure => installed;
diff --git a/modules/munin-node/manifests/apache.pp b/modules/munin-node/manifests/apache.pp
deleted file mode 100644
index 2293c512b..000000000
--- a/modules/munin-node/manifests/apache.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-class munin-node::apache inherits munin-node {
-        activate_munin_check {
-                "apache_accesses":;
-                "apache_processes":;
-                "apache_volume":;
-                "apache_servers":;
-                "ps_apache2": script => "ps_";
-        }
-}
-
diff --git a/modules/munin-node/manifests/bind.pp b/modules/munin-node/manifests/bind.pp
deleted file mode 100644
index 3a9d18401..000000000
--- a/modules/munin-node/manifests/bind.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-class munin-node::bind inherits munin-node {
-        activate_munin_check {
-                "bind":;
-        }
-}
-
diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 06d47cedf..59fe205ab 100644
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -54,7 +54,13 @@ class munin-node {
 
     case $vsftpd {
         "true": {
-              include munin-node::vsftpd
+              package { 
+                      "logtail": ensure => installed;
+              }
+              activate_munin_check {
+                      "vsftpd":;
+                      "ps_vsftpd": script => "ps_";
+              }
         }
     }
 
diff --git a/modules/munin-node/manifests/vsftpd.pp b/modules/munin-node/manifests/vsftpd.pp
deleted file mode 100644
index 9af1e925e..000000000
--- a/modules/munin-node/manifests/vsftpd.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-class munin-node::vsftpd inherits munin-node {
-        package { 
-                "logtail": ensure => installed;
-        }
-        activate_munin_check {
-                "vsftpd":;
-                "ps_vsftpd": script => "ps_";
-        }
-}
-
diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index 719c0e7b4..b5233758f 100644
--- a/modules/named/manifests/init.pp
+++ b/modules/named/manifests/init.pp
@@ -1,5 +1,7 @@
 class named {
-        include munin-node::bind
+        activate_munin_check {
+                "bind":;
+        }
 
         package {
                 bind9: ensure => installed;