From f07f6a5fab8964acebb0821094597fa4a597dba2 Mon Sep 17 00:00:00 2001
From: am <am@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Fri, 30 Nov 2007 15:28:46 +0000
Subject: munin installation (+ test auf immer1-0)

git-svn-id: https://svn/ipuppet/trunk/modules/munin@173 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 manifests/client.pp

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
new file mode 100644
index 0000000..5b78186
--- /dev/null
+++ b/manifests/client.pp
@@ -0,0 +1,122 @@
+# client.pp - configure a munin node
+# Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at>
+# See LICENSE for the full license granted to you.
+
+class munin::client {
+
+	$munin_port_real = $munin_port ? { '' => 4949, default => $munin_port } 
+	$munin_host_real = $munin_host ? {
+		'' => '*',
+		'fqdn' => '*',
+		default => $munin_host
+	}
+
+	case $operatingsystem {
+		darwin: { include munin::client::darwin }
+		debian: {
+			include munin::client::debian
+			include munin::plugins::debian
+		}
+		ubuntu: {
+			info ( "Trying to configure Ubuntu's munin with Debian class" )
+			include munin::client::debian
+			include munin::plugins::debian
+		}
+		default: { fail ("Don't know how to handle munin on $operatingsystem") }
+	}
+
+	case $kernel {
+		linux: {
+			case $vserver {
+				guest: { include munin::plugins::vserver }
+				default: {
+					include munin::plugins::linux
+					case $virtual {
+						xen0: { include munin::plugins::xen }
+					}
+				}
+			}
+		}
+		default: {
+			err( "Don't know which munin plugins to install for $kernel" )
+		}
+	}
+
+}
+
+define munin::register()
+{
+	$munin_port_real = $munin_port ? { '' => 4949, default => $munin_port } 
+	$munin_host_real = $munin_host ? {
+		'' => $fqdn,
+		'fqdn' => $fqdn,
+		default => $munin_host
+	}
+
+	@@file { "${NODESDIR}/${name}_${munin_port_real}":
+		ensure => present,
+		content => template("munin/defaultclient.erb"),
+	}
+}
+
+define munin::register_snmp()
+{
+	@@file { "munin_snmp_${name}": path => "${NODESDIR}/${name}",
+		ensure => present,
+		content => template("munin/snmpclient.erb"),
+	}
+}
+
+class munin::client::darwin 
+{
+	file { "/usr/share/snmp/snmpd.conf": 
+		mode => 744,
+		content => template("munin/darwin_snmpd.conf.erb"),
+		group  => staff,
+		owner  => root,
+	}
+	delete_matching_line{"startsnmpdno":
+		file => "/etc/hostconfig",
+		pattern => "SNMPSERVER=-NO-",
+	}
+	line { "startsnmpdyes":
+		file => "/etc/hostconfig",
+		line => "SNMPSERVER=-YES-",
+		notify => Exec["/sbin/SystemStarter start SNMP"],
+	}
+	exec{"/sbin/SystemStarter start SNMP":
+		noop => false,
+	} 
+	munin::register_snmp { $fqdn: }
+}
+
+class munin::client::debian 
+{
+
+	package { "munin-node": ensure => installed }
+
+	file {
+		"/etc/munin/":
+			ensure => directory,
+			mode => 0755, owner => root, group => root;
+		"/etc/munin/munin-node.conf":
+			content => template("munin/munin-node.conf.${operatingsystem}.${lsbdistcodename}"),
+			mode => 0644, owner => root, group => root,
+			# this has to be installed before the package, so the postinst can
+			# boot the munin-node without failure!
+			before => Package["munin-node"],
+			notify => Service["munin-node"],
+	}
+
+	service { "munin-node":
+		ensure => running, 
+		# sarge's munin-node init script has no status
+		hasstatus => $lsbdistcodename ? { sarge => false, default => true }
+	}
+
+	munin::register { $fqdn: }
+
+	# workaround bug in munin_node_configure
+	plugin { "postfix_mailvolume": ensure => absent }
+}
+
-- 
cgit v1.2.3


From be9ce325e83e2521628a70a11b644e373c017839 Mon Sep 17 00:00:00 2001
From: am <am@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Tue, 4 Dec 2007 09:08:38 +0000
Subject: added gentoo to munin module

git-svn-id: https://svn/ipuppet/trunk/modules/munin@182 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index 5b78186..f5caaec 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -22,6 +22,11 @@ class munin::client {
 			include munin::client::debian
 			include munin::plugins::debian
 		}
+		gentoo: {
+			include munin::client::gentoo
+			include munin::plugins::gentoo
+	
+		}
 		default: { fail ("Don't know how to handle munin on $operatingsystem") }
 	}
 
@@ -120,3 +125,35 @@ class munin::client::debian
 	plugin { "postfix_mailvolume": ensure => absent }
 }
 
+class munin::client::gentoo 
+{
+        package { 'munin':
+                ensure => present,
+                category => $operatingsystem ? {
+                        gentoo => 'net-analyzer',
+                        default => '',
+                },
+        }
+
+
+	file {
+		"/etc/munin/":
+			ensure => directory,
+			mode => 0755, owner => root, group => root;
+		"/etc/munin/munin-node.conf":
+			content => template("munin/munin-node.conf.Gentoo."),
+			mode => 0644, owner => root, group => root,
+			# this has to be installed before the package, so the postinst can
+			# boot the munin-node without failure!
+			before => Package["munin-node"],
+			notify => Service["munin-node"],
+	}
+
+	service { "munin":
+		ensure => running, 
+	}
+
+	munin::register { $fqdn: }
+
+}
+
-- 
cgit v1.2.3


From 4d9eb3d04b2ed3efba52d45e2a24cf7ed7965151 Mon Sep 17 00:00:00 2001
From: am <am@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Tue, 4 Dec 2007 17:18:35 +0000
Subject: munin-node in gentoo is munin

git-svn-id: https://svn/ipuppet/trunk/modules/munin@188 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index f5caaec..639d133 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -145,8 +145,8 @@ class munin::client::gentoo
 			mode => 0644, owner => root, group => root,
 			# this has to be installed before the package, so the postinst can
 			# boot the munin-node without failure!
-			before => Package["munin-node"],
-			notify => Service["munin-node"],
+			before => Package["munin"],
+			notify => Service["munin"],
 	}
 
 	service { "munin":
-- 
cgit v1.2.3


From 3e232c2c8387fb5531796994d748fe1e99bac065 Mon Sep 17 00:00:00 2001
From: am <am@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Tue, 4 Dec 2007 18:49:37 +0000
Subject: strange...

git-svn-id: https://svn/ipuppet/trunk/modules/munin@193 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index 639d133..47df43d 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -145,8 +145,8 @@ class munin::client::gentoo
 			mode => 0644, owner => root, group => root,
 			# this has to be installed before the package, so the postinst can
 			# boot the munin-node without failure!
-			before => Package["munin"],
-			notify => Service["munin"],
+			#before => Package["munin"],
+			#notify => Service["munin"],
 	}
 
 	service { "munin":
-- 
cgit v1.2.3


From dcdadb9a99917ab7214fcb57c64cab2047cd8fe3 Mon Sep 17 00:00:00 2001
From: am <am@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Tue, 4 Dec 2007 18:55:43 +0000
Subject: war ein anderer fehler ... shit

git-svn-id: https://svn/ipuppet/trunk/modules/munin@194 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index 47df43d..639d133 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -145,8 +145,8 @@ class munin::client::gentoo
 			mode => 0644, owner => root, group => root,
 			# this has to be installed before the package, so the postinst can
 			# boot the munin-node without failure!
-			#before => Package["munin"],
-			#notify => Service["munin"],
+			before => Package["munin"],
+			notify => Service["munin"],
 	}
 
 	service { "munin":
-- 
cgit v1.2.3


From 01273ad5699ff5791416892fb25f84b1ba227d05 Mon Sep 17 00:00:00 2001
From: am <am@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Fri, 7 Dec 2007 11:07:31 +0000
Subject: * added centos to the munin module * little corrections in
 shorewall-local stuff

git-svn-id: https://svn/ipuppet/trunk/modules/munin@214 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index 639d133..18a4043 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -25,7 +25,10 @@ class munin::client {
 		gentoo: {
 			include munin::client::gentoo
 			include munin::plugins::gentoo
-	
+		}
+		centos: {
+			include munin::client::centos
+			include munin::plugins::centos
 		}
 		default: { fail ("Don't know how to handle munin on $operatingsystem") }
 	}
@@ -157,3 +160,35 @@ class munin::client::gentoo
 
 }
 
+class munin::client::centos 
+{
+        package { 'munin-node':
+                ensure => present,
+                category => $operatingsystem ? {
+                        gentoo => 'net-analyzer',
+                        default => '',
+                },
+        }
+
+
+	file {
+		"/etc/munin/":
+			ensure => directory,
+			mode => 0755, owner => root, group => root;
+		"/etc/munin/munin-node.conf":
+			content => template("munin/munin-node.conf.CentOS."),
+			mode => 0644, owner => root, group => root,
+			# this has to be installed before the package, so the postinst can
+			# boot the munin-node without failure!
+			before => Package["munin"],
+			notify => Service["munin"],
+	}
+
+	service { "munin":
+		ensure => running, 
+	}
+
+	munin::register { $fqdn: }
+
+}
+
-- 
cgit v1.2.3


From aad7d1cb8c499af0ebe5f8a1ab0c55b9017b7ea2 Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Wed, 2 Jan 2008 20:16:12 +0000
Subject: fixed group stuff

git-svn-id: https://svn/ipuppet/trunk/modules/munin@350 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index 18a4043..2e8f018 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -80,7 +80,7 @@ class munin::client::darwin
 	file { "/usr/share/snmp/snmpd.conf": 
 		mode => 744,
 		content => template("munin/darwin_snmpd.conf.erb"),
-		group  => staff,
+		group  => 0,
 		owner  => root,
 	}
 	delete_matching_line{"startsnmpdno":
@@ -106,10 +106,10 @@ class munin::client::debian
 	file {
 		"/etc/munin/":
 			ensure => directory,
-			mode => 0755, owner => root, group => root;
+			mode => 0755, owner => root, group => 0;
 		"/etc/munin/munin-node.conf":
 			content => template("munin/munin-node.conf.${operatingsystem}.${lsbdistcodename}"),
-			mode => 0644, owner => root, group => root,
+			mode => 0644, owner => root, group => 0,
 			# this has to be installed before the package, so the postinst can
 			# boot the munin-node without failure!
 			before => Package["munin-node"],
@@ -142,10 +142,10 @@ class munin::client::gentoo
 	file {
 		"/etc/munin/":
 			ensure => directory,
-			mode => 0755, owner => root, group => root;
+			mode => 0755, owner => root, group => 0;
 		"/etc/munin/munin-node.conf":
 			content => template("munin/munin-node.conf.Gentoo."),
-			mode => 0644, owner => root, group => root,
+			mode => 0644, owner => root, group => 0,
 			# this has to be installed before the package, so the postinst can
 			# boot the munin-node without failure!
 			before => Package["munin"],
@@ -174,10 +174,10 @@ class munin::client::centos
 	file {
 		"/etc/munin/":
 			ensure => directory,
-			mode => 0755, owner => root, group => root;
+			mode => 0755, owner => root, group =>0;
 		"/etc/munin/munin-node.conf":
 			content => template("munin/munin-node.conf.CentOS."),
-			mode => 0644, owner => root, group => root,
+			mode => 0644, owner => root, group => 0,
 			# this has to be installed before the package, so the postinst can
 			# boot the munin-node without failure!
 			before => Package["munin"],
-- 
cgit v1.2.3


From f637dc37d96a1715634734c5ef9d7d5ecd13a447 Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Wed, 30 Jan 2008 21:37:34 +0000
Subject: rearranged some stuff

git-svn-id: https://svn/ipuppet/trunk/modules/munin@607 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index 2e8f018..1aa0e88 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -40,7 +40,7 @@ class munin::client {
 				default: {
 					include munin::plugins::linux
 					case $virtual {
-						xen0: { include munin::plugins::xen }
+						xen0: { include munin::plugins::dom0 }
 					}
 				}
 			}
@@ -100,6 +100,7 @@ class munin::client::darwin
 
 class munin::client::debian 
 {
+    $script_path_default =  "/usr/share/munin/plugins"
 
 	package { "munin-node": ensure => installed }
 
@@ -130,13 +131,15 @@ class munin::client::debian
 
 class munin::client::gentoo 
 {
-        package { 'munin':
+    $script_path_default =  "/usr/libexec/munin/plugins"
+    $acpi_available = "absent"
+    package { 'munin':
                 ensure => present,
                 category => $operatingsystem ? {
                         gentoo => 'net-analyzer',
                         default => '',
                 },
-        }
+    }
 
 
 	file {
@@ -157,18 +160,18 @@ class munin::client::gentoo
 	}
 
 	munin::register { $fqdn: }
-
 }
 
 class munin::client::centos 
 {
-        package { 'munin-node':
+    $script_path_default =  "/usr/share/munin/plugins"
+    package { 'munin-node':
                 ensure => present,
                 category => $operatingsystem ? {
                         gentoo => 'net-analyzer',
                         default => '',
                 },
-        }
+    }
 
 
 	file {
-- 
cgit v1.2.3


From 7700dacfbdd0d6366a5c05d5bb1a72844a55b8fd Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Thu, 31 Jan 2008 20:04:42 +0000
Subject: fixed servicemodules/munin/manifests/client.pp

git-svn-id: https://svn/ipuppet/trunk/modules/munin@648 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index 1aa0e88..d20850a 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -155,7 +155,7 @@ class munin::client::gentoo
 			notify => Service["munin"],
 	}
 
-	service { "munin":
+	service { "munin-node":
 		ensure => running, 
 	}
 
-- 
cgit v1.2.3


From c53532f9bc5a360522a067b14ef81de66add9d17 Mon Sep 17 00:00:00 2001
From: am <am@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Thu, 31 Jan 2008 20:06:20 +0000
Subject: munin-node service

git-svn-id: https://svn/ipuppet/trunk/modules/munin@649 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index d20850a..c2a59e4 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -165,7 +165,7 @@ class munin::client::gentoo
 class munin::client::centos 
 {
     $script_path_default =  "/usr/share/munin/plugins"
-    package { 'munin-node':
+    package { 'munin':
                 ensure => present,
                 category => $operatingsystem ? {
                         gentoo => 'net-analyzer',
@@ -187,7 +187,7 @@ class munin::client::centos
 			notify => Service["munin"],
 	}
 
-	service { "munin":
+	service { "munin-node":
 		ensure => running, 
 	}
 
-- 
cgit v1.2.3


From fd721045a7d529f3b9fbc796c58e26177b89ad65 Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Thu, 31 Jan 2008 20:13:15 +0000
Subject: fixed service

git-svn-id: https://svn/ipuppet/trunk/modules/munin@651 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index c2a59e4..bc47a23 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -152,7 +152,7 @@ class munin::client::gentoo
 			# this has to be installed before the package, so the postinst can
 			# boot the munin-node without failure!
 			before => Package["munin"],
-			notify => Service["munin"],
+			notify => Service["munin-node"],
 	}
 
 	service { "munin-node":
-- 
cgit v1.2.3


From b2bbba673547959692b51f783b71959a17dce7dd Mon Sep 17 00:00:00 2001
From: am <am@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Thu, 31 Jan 2008 20:16:54 +0000
Subject: chaos-a...

git-svn-id: https://svn/ipuppet/trunk/modules/munin@652 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index bc47a23..56742cb 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -187,7 +187,7 @@ class munin::client::centos
 			notify => Service["munin"],
 	}
 
-	service { "munin-node":
+	service { "munin":
 		ensure => running, 
 	}
 
-- 
cgit v1.2.3


From b929f469342c6c61ff29bb9f5f4271ab80d5d5fe Mon Sep 17 00:00:00 2001
From: am <am@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Thu, 31 Jan 2008 20:18:05 +0000
Subject: doch munin-node

git-svn-id: https://svn/ipuppet/trunk/modules/munin@653 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index 56742cb..bc47a23 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -187,7 +187,7 @@ class munin::client::centos
 			notify => Service["munin"],
 	}
 
-	service { "munin":
+	service { "munin-node":
 		ensure => running, 
 	}
 
-- 
cgit v1.2.3


From 26e8702b15a37a5e22c070cbd6dd0105355b0d45 Mon Sep 17 00:00:00 2001
From: am <am@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Thu, 31 Jan 2008 22:14:36 +0000
Subject: gentoo auf munin, versuch symlink

git-svn-id: https://svn/ipuppet/trunk/modules/munin@655 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index bc47a23..af2c523 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -152,10 +152,10 @@ class munin::client::gentoo
 			# this has to be installed before the package, so the postinst can
 			# boot the munin-node without failure!
 			before => Package["munin"],
-			notify => Service["munin-node"],
+			notify => Service["munin"],
 	}
 
-	service { "munin-node":
+	service { "munin":
 		ensure => running, 
 	}
 
-- 
cgit v1.2.3


From 562c898ab81bc9ee19548f9b4601d39773b516e1 Mon Sep 17 00:00:00 2001
From: am <am@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Thu, 31 Jan 2008 22:19:05 +0000
Subject: kein notify?

git-svn-id: https://svn/ipuppet/trunk/modules/munin@656 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index af2c523..3c2814b 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -141,6 +141,13 @@ class munin::client::gentoo
                 },
     }
 
+    # link
+    file{
+        "/etc/init.d/munin":
+            ensure => "/etc/init.d/munin-node",
+    }
+
+
 
 	file {
 		"/etc/munin/":
@@ -152,7 +159,7 @@ class munin::client::gentoo
 			# this has to be installed before the package, so the postinst can
 			# boot the munin-node without failure!
 			before => Package["munin"],
-			notify => Service["munin"],
+	    #		notify => Service["munin"],
 	}
 
 	service { "munin":
-- 
cgit v1.2.3


From 24a5855d19e604e2d1cd23270d6d2514a2839ee0 Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Thu, 31 Jan 2008 23:25:21 +0000
Subject: really needed?

git-svn-id: https://svn/ipuppet/trunk/modules/munin@659 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index 3c2814b..4e89f12 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -142,10 +142,11 @@ class munin::client::gentoo
     }
 
     # link
-    file{
-        "/etc/init.d/munin":
-            ensure => "/etc/init.d/munin-node",
-    }
+    # mh: really needed?
+#    file{
+#        "/etc/init.d/munin":
+#            ensure => "/etc/init.d/munin-node",
+#    }
 
 
 
-- 
cgit v1.2.3


From db0ab2b74a969303bd5adb678e24c1e7bebb64c7 Mon Sep 17 00:00:00 2001
From: am <am@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Fri, 1 Feb 2008 14:25:50 +0000
Subject: test in modul

git-svn-id: https://svn/ipuppet/trunk/modules/munin@676 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index 4e89f12..f334756 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -203,3 +203,11 @@ class munin::client::centos
 
 }
 
+define munin::client::immer1-5($domU_number = '0') {
+    $munin_port = $domU_number ? {
+       '4949' => 4949,
+       default => muninport($domU_number);
+    }
+
+    include munin::client
+}
-- 
cgit v1.2.3


From dda34c92a218f2f77a2904a868c573e766898d37 Mon Sep 17 00:00:00 2001
From: am <am@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Fri, 1 Feb 2008 14:28:32 +0000
Subject: fehler?

git-svn-id: https://svn/ipuppet/trunk/modules/munin@677 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index f334756..341aeaa 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -203,7 +203,7 @@ class munin::client::centos
 
 }
 
-define munin::client::immer1-5($domU_number = '0') {
+define munin::client::immertest($domU_number = '0') {
     $munin_port = $domU_number ? {
        '4949' => 4949,
        default => muninport($domU_number);
-- 
cgit v1.2.3


From 775a5fb9185abb040659cea5bb4c3490633ae888 Mon Sep 17 00:00:00 2001
From: am <am@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Fri, 1 Feb 2008 14:32:06 +0000
Subject: test

git-svn-id: https://svn/ipuppet/trunk/modules/munin@678 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index 341aeaa..e0cf17b 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -203,7 +203,7 @@ class munin::client::centos
 
 }
 
-define munin::client::immertest($domU_number = '0') {
+define munin::immertest($domU_number = '0') {
     $munin_port = $domU_number ? {
        '4949' => 4949,
        default => muninport($domU_number);
@@ -211,3 +211,4 @@ define munin::client::immertest($domU_number = '0') {
 
     include munin::client
 }
+
-- 
cgit v1.2.3


From a9a318e0c451bbddeaaac135ac4317bb01599bc4 Mon Sep 17 00:00:00 2001
From: am <am@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Fri, 1 Feb 2008 14:43:48 +0000
Subject: case...

git-svn-id: https://svn/ipuppet/trunk/modules/munin@679 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index e0cf17b..510945d 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -203,12 +203,4 @@ class munin::client::centos
 
 }
 
-define munin::immertest($domU_number = '0') {
-    $munin_port = $domU_number ? {
-       '4949' => 4949,
-       default => muninport($domU_number);
-    }
-
-    include munin::client
-}
 
-- 
cgit v1.2.3


From 1116b7ecf0b2760e09e589543a1a6fb9a6fed38b Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Fri, 1 Feb 2008 18:29:58 +0000
Subject: fixed some service correlation

git-svn-id: https://svn/ipuppet/trunk/modules/munin@707 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index 510945d..df60a77 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -134,6 +134,7 @@ class munin::client::gentoo
     $script_path_default =  "/usr/libexec/munin/plugins"
     $acpi_available = "absent"
     package { 'munin':
+                alias => 'munin-node'
                 ensure => present,
                 category => $operatingsystem ? {
                         gentoo => 'net-analyzer',
@@ -159,7 +160,7 @@ class munin::client::gentoo
 			mode => 0644, owner => root, group => 0,
 			# this has to be installed before the package, so the postinst can
 			# boot the munin-node without failure!
-			before => Package["munin"],
+			before => Package["munin-node"],
 	    #		notify => Service["munin"],
 	}
 
@@ -175,10 +176,6 @@ class munin::client::centos
     $script_path_default =  "/usr/share/munin/plugins"
     package { 'munin':
                 ensure => present,
-                category => $operatingsystem ? {
-                        gentoo => 'net-analyzer',
-                        default => '',
-                },
     }
 
 
@@ -191,7 +188,7 @@ class munin::client::centos
 			mode => 0644, owner => root, group => 0,
 			# this has to be installed before the package, so the postinst can
 			# boot the munin-node without failure!
-			before => Package["munin"],
+			before => Package["munin-node"],
 			notify => Service["munin"],
 	}
 
-- 
cgit v1.2.3


From a35e38d571e0a3411f4fd1831cdb18235157621f Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Fri, 1 Feb 2008 18:33:29 +0000
Subject: fixed some service correlation

git-svn-id: https://svn/ipuppet/trunk/modules/munin@708 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index df60a77..d61db3b 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -174,7 +174,7 @@ class munin::client::gentoo
 class munin::client::centos 
 {
     $script_path_default =  "/usr/share/munin/plugins"
-    package { 'munin':
+    package { 'munin-node':
                 ensure => present,
     }
 
-- 
cgit v1.2.3


From 4fb0b2fa23bc1aa4e1eaf34cff6b2fa17653e3f1 Mon Sep 17 00:00:00 2001
From: am <am@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Fri, 1 Feb 2008 18:59:21 +0000
Subject: tippfehler

git-svn-id: https://svn/ipuppet/trunk/modules/munin@710 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index d61db3b..d0f793e 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -134,7 +134,7 @@ class munin::client::gentoo
     $script_path_default =  "/usr/libexec/munin/plugins"
     $acpi_available = "absent"
     package { 'munin':
-                alias => 'munin-node'
+                alias => 'munin-node',
                 ensure => present,
                 category => $operatingsystem ? {
                         gentoo => 'net-analyzer',
-- 
cgit v1.2.3


From 07415f2506af67e05d83d04979f4e8f2d3fc1a1b Mon Sep 17 00:00:00 2001
From: am <am@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Fri, 1 Feb 2008 19:06:03 +0000
Subject: test

git-svn-id: https://svn/ipuppet/trunk/modules/munin@712 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index d0f793e..71f86fa 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -134,7 +134,7 @@ class munin::client::gentoo
     $script_path_default =  "/usr/libexec/munin/plugins"
     $acpi_available = "absent"
     package { 'munin':
-                alias => 'munin-node',
+                alias => munin-node,
                 ensure => present,
                 category => $operatingsystem ? {
                         gentoo => 'net-analyzer',
-- 
cgit v1.2.3


From b3a600ad26a21e446d528a93ff03d3ca9dfb66c1 Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Fri, 1 Feb 2008 19:11:06 +0000
Subject: fixed service problem

git-svn-id: https://svn/ipuppet/trunk/modules/munin@713 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index 71f86fa..17ad207 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -164,7 +164,7 @@ class munin::client::gentoo
 	    #		notify => Service["munin"],
 	}
 
-	service { "munin":
+	service { "munin-node":
 		ensure => running, 
 	}
 
@@ -189,7 +189,7 @@ class munin::client::centos
 			# this has to be installed before the package, so the postinst can
 			# boot the munin-node without failure!
 			before => Package["munin-node"],
-			notify => Service["munin"],
+			notify => Service["munin-node"],
 	}
 
 	service { "munin-node":
-- 
cgit v1.2.3


From fd7b356081ce48f9b882610fe06f17cd4762c3c7 Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Sat, 2 Feb 2008 00:33:47 +0000
Subject: fixed language problem, added need package by debian

git-svn-id: https://svn/ipuppet/trunk/modules/munin@734 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index 17ad207..7dcbbe1 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -103,6 +103,8 @@ class munin::client::debian
     $script_path_default =  "/usr/share/munin/plugins"
 
 	package { "munin-node": ensure => installed }
+    # the plugin will need that
+	package { "iproute": ensure => installed }
 
 	file {
 		"/etc/munin/":
-- 
cgit v1.2.3


From 1115e76a91b398ccb45f2cd5ea2195cb3351bc22 Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Wed, 6 Feb 2008 20:31:50 +0000
Subject: fixed? munin plugin problems

git-svn-id: https://svn/ipuppet/trunk/modules/munin@764 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index 7dcbbe1..ba59333 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -100,8 +100,6 @@ class munin::client::darwin
 
 class munin::client::debian 
 {
-    $script_path_default =  "/usr/share/munin/plugins"
-
 	package { "munin-node": ensure => installed }
     # the plugin will need that
 	package { "iproute": ensure => installed }
@@ -133,10 +131,10 @@ class munin::client::debian
 
 class munin::client::gentoo 
 {
-    $script_path_default =  "/usr/libexec/munin/plugins"
     $acpi_available = "absent"
-    package { 'munin':
-                alias => munin-node,
+    package { 'munin-node':
+                name => 'munin',
+                alias => 'munin-node',
                 ensure => present,
                 category => $operatingsystem ? {
                         gentoo => 'net-analyzer',
@@ -144,15 +142,6 @@ class munin::client::gentoo
                 },
     }
 
-    # link
-    # mh: really needed?
-#    file{
-#        "/etc/init.d/munin":
-#            ensure => "/etc/init.d/munin-node",
-#    }
-
-
-
 	file {
 		"/etc/munin/":
 			ensure => directory,
@@ -175,7 +164,6 @@ class munin::client::gentoo
 
 class munin::client::centos 
 {
-    $script_path_default =  "/usr/share/munin/plugins"
     package { 'munin-node':
                 ensure => present,
     }
-- 
cgit v1.2.3


From f0b680075d3106efc0a04c8fd3a5d5f05dbe82e6 Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Wed, 6 Feb 2008 20:39:54 +0000
Subject: fixed double package problem

git-svn-id: https://svn/ipuppet/trunk/modules/munin@765 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index ba59333..13f3e09 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -134,7 +134,6 @@ class munin::client::gentoo
     $acpi_available = "absent"
     package { 'munin-node':
                 name => 'munin',
-                alias => 'munin-node',
                 ensure => present,
                 category => $operatingsystem ? {
                         gentoo => 'net-analyzer',
-- 
cgit v1.2.3


From 89ef873f7b1f26e670fb4abc8cadea8e87e76de0 Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Fri, 21 Mar 2008 15:54:48 +0000
Subject: rearranged some munin stuff

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1081 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index 13f3e09..0a65418 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -39,9 +39,6 @@ class munin::client {
 				guest: { include munin::plugins::vserver }
 				default: {
 					include munin::plugins::linux
-					case $virtual {
-						xen0: { include munin::plugins::dom0 }
-					}
 				}
 			}
 		}
@@ -49,6 +46,11 @@ class munin::client {
 			err( "Don't know which munin plugins to install for $kernel" )
 		}
 	}
+	case $virtual {
+        physical: { munin::plugins::physical }
+	    xen0: { include munin::plugins::dom0 }
+        xenu: { include munin::plugins::domU }
+    }
 
 }
 
-- 
cgit v1.2.3


From 1804eec4a2d9d99964373595da00349adc869cac Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Fri, 21 Mar 2008 15:57:06 +0000
Subject: fixed typo

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1082 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index 0a65418..dbf175a 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -47,7 +47,7 @@ class munin::client {
 		}
 	}
 	case $virtual {
-        physical: { munin::plugins::physical }
+        physical: { include munin::plugins::physical }
 	    xen0: { include munin::plugins::dom0 }
         xenu: { include munin::plugins::domU }
     }
-- 
cgit v1.2.3


From a969b61bab854b4c4a9bb7f216073dd426514f73 Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Sat, 29 Mar 2008 14:47:43 +0000
Subject: merged munin-module with davids

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1143 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index dbf175a..c81e6f4 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -74,6 +74,7 @@ define munin::register_snmp()
 	@@file { "munin_snmp_${name}": path => "${NODESDIR}/${name}",
 		ensure => present,
 		content => template("munin/snmpclient.erb"),
+        tag => 'munin',
 	}
 }
 
-- 
cgit v1.2.3


From a3ac1c067e22f25b6fa5643873a4a935358561f1 Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Thu, 24 Apr 2008 11:05:25 +0000
Subject: fixed munin stuff

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1248 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index c81e6f4..8181845 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -66,6 +66,7 @@ define munin::register()
 	@@file { "${NODESDIR}/${name}_${munin_port_real}":
 		ensure => present,
 		content => template("munin/defaultclient.erb"),
+        tag => 'munin',
 	}
 }
 
@@ -129,7 +130,7 @@ class munin::client::debian
 	munin::register { $fqdn: }
 
 	# workaround bug in munin_node_configure
-	plugin { "postfix_mailvolume": ensure => absent }
+	munin::plugin { "postfix_mailvolume": ensure => absent }
 }
 
 class munin::client::gentoo 
-- 
cgit v1.2.3


From 9dca19736cd11ed42cfdb8aed30c8628b22231cb Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Thu, 24 Apr 2008 13:26:14 +0000
Subject: merged with puzzle upstream

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1254 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 168 ++++++++++++++--------------------------------------
 1 file changed, 46 insertions(+), 122 deletions(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index 8181845..69e9f2e 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -11,47 +11,14 @@ class munin::client {
 		default => $munin_host
 	}
 
-	case $operatingsystem {
-		darwin: { include munin::client::darwin }
-		debian: {
-			include munin::client::debian
-			include munin::plugins::debian
-		}
-		ubuntu: {
-			info ( "Trying to configure Ubuntu's munin with Debian class" )
-			include munin::client::debian
-			include munin::plugins::debian
-		}
-		gentoo: {
-			include munin::client::gentoo
-			include munin::plugins::gentoo
-		}
-		centos: {
-			include munin::client::centos
-			include munin::plugins::centos
-		}
-		default: { fail ("Don't know how to handle munin on $operatingsystem") }
-	}
-
-	case $kernel {
-		linux: {
-			case $vserver {
-				guest: { include munin::plugins::vserver }
-				default: {
-					include munin::plugins::linux
-				}
-			}
-		}
-		default: {
-			err( "Don't know which munin plugins to install for $kernel" )
-		}
-	}
-	case $virtual {
-        physical: { include munin::plugins::physical }
-	    xen0: { include munin::plugins::dom0 }
-        xenu: { include munin::plugins::domU }
+    case $operatingsystem {
+        darwin: { include munin::client::darwin }
+        debian: { include munin::client::debian }
+        ubuntu: { include munin::client::ubuntu }
+        centos: { include munin::client::centos }
+        gentoo: { include munin::client::gentoo }
+        default: { include munin::client::base }
     }
-
 }
 
 define munin::register()
@@ -66,7 +33,7 @@ define munin::register()
 	@@file { "${NODESDIR}/${name}_${munin_port_real}":
 		ensure => present,
 		content => template("munin/defaultclient.erb"),
-        tag => 'munin',
+		tag => 'munin',
 	}
 }
 
@@ -75,12 +42,34 @@ define munin::register_snmp()
 	@@file { "munin_snmp_${name}": path => "${NODESDIR}/${name}",
 		ensure => present,
 		content => template("munin/snmpclient.erb"),
-        tag => 'munin',
+		tag => 'munin',
 	}
 }
 
-class munin::client::darwin 
-{
+class munin::client::base {
+	package { "munin-node": ensure => installed }
+	service { "munin-node":
+		ensure => running, 
+        hasstatus => true,
+        hasrestart => true,
+        require => Package[munin-node],
+	}
+	file {
+		"/etc/munin/":
+			ensure => directory,
+			mode => 0755, owner => root, group => 0;
+		"/etc/munin/munin-node.conf":
+			content => template("munin/munin-node.conf.$operatingsystem.$lsbdistrelease"),
+			mode => 0644, owner => root, group => 0,
+			# this has to be installed before the package, so the postinst can
+			# boot the munin-node without failure!
+			before => Package["munin-node"],
+	}
+	munin::register { $fqdn: }
+	include munin::plugins::base
+}
+
+class munin::client::darwin {
 	file { "/usr/share/snmp/snmpd.conf": 
 		mode => 744,
 		content => template("munin/darwin_snmpd.conf.erb"),
@@ -102,95 +91,30 @@ class munin::client::darwin
 	munin::register_snmp { $fqdn: }
 }
 
-class munin::client::debian 
-{
-	package { "munin-node": ensure => installed }
+class munin::client::debian inherits munin::client::base {
     # the plugin will need that
 	package { "iproute": ensure => installed }
 
-	file {
-		"/etc/munin/":
-			ensure => directory,
-			mode => 0755, owner => root, group => 0;
-		"/etc/munin/munin-node.conf":
-			content => template("munin/munin-node.conf.${operatingsystem}.${lsbdistcodename}"),
-			mode => 0644, owner => root, group => 0,
-			# this has to be installed before the package, so the postinst can
-			# boot the munin-node without failure!
-			before => Package["munin-node"],
-			notify => Service["munin-node"],
-	}
-
-	service { "munin-node":
-		ensure => running, 
+	Service["munin-node"]{
 		# sarge's munin-node init script has no status
 		hasstatus => $lsbdistcodename ? { sarge => false, default => true }
 	}
-
-	munin::register { $fqdn: }
-
 	# workaround bug in munin_node_configure
-	munin::plugin { "postfix_mailvolume": ensure => absent }
+	plugin { "postfix_mailvolume": ensure => absent }
+	include munin::plugins::debian
 }
 
-class munin::client::gentoo 
-{
-    $acpi_available = "absent"
-    package { 'munin-node':
-                name => 'munin',
-                ensure => present,
-                category => $operatingsystem ? {
-                        gentoo => 'net-analyzer',
-                        default => '',
-                },
-    }
-
-	file {
-		"/etc/munin/":
-			ensure => directory,
-			mode => 0755, owner => root, group => 0;
-		"/etc/munin/munin-node.conf":
-			content => template("munin/munin-node.conf.Gentoo."),
-			mode => 0644, owner => root, group => 0,
-			# this has to be installed before the package, so the postinst can
-			# boot the munin-node without failure!
-			before => Package["munin-node"],
-	    #		notify => Service["munin"],
-	}
-
-	service { "munin-node":
-		ensure => running, 
-	}
-
-	munin::register { $fqdn: }
-}
+class munin::client::ubuntu inherits munin::client::debian {}
 
-class munin::client::centos 
-{
-    package { 'munin-node':
-                ensure => present,
+class munin::client::gentoo inherits munin::client::base {
+    Package['munin-node'] {
+        name => 'munin',
+        category => 'net-analyzer',
     }
 
-
-	file {
-		"/etc/munin/":
-			ensure => directory,
-			mode => 0755, owner => root, group =>0;
-		"/etc/munin/munin-node.conf":
-			content => template("munin/munin-node.conf.CentOS."),
-			mode => 0644, owner => root, group => 0,
-			# this has to be installed before the package, so the postinst can
-			# boot the munin-node without failure!
-			before => Package["munin-node"],
-			notify => Service["munin-node"],
-	}
-
-	service { "munin-node":
-		ensure => running, 
-	}
-
-	munin::register { $fqdn: }
-
+	include munin::plugins::gentoo
 }
 
-
+class munin::client::centos inherits munin::client::base {
+	include munin::plugins::centos
+}
-- 
cgit v1.2.3


From 3b9dff3584c98fe8e2754fe91204748853e84d84 Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Thu, 24 Apr 2008 14:35:15 +0000
Subject: refixed template path

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1257 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index 69e9f2e..39d9a15 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -59,7 +59,7 @@ class munin::client::base {
 			ensure => directory,
 			mode => 0755, owner => root, group => 0;
 		"/etc/munin/munin-node.conf":
-			content => template("munin/munin-node.conf.$operatingsystem.$lsbdistrelease"),
+			content => template("munin/munin-node.conf.$operatingsystem.$lsbdistcodename"),
 			mode => 0644, owner => root, group => 0,
 			# this has to be installed before the package, so the postinst can
 			# boot the munin-node without failure!
-- 
cgit v1.2.3


From 540d97e640a7b1415cdaffae922a5253f0e3790d Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Thu, 24 Apr 2008 15:03:26 +0000
Subject: fixed munin-conf on gentoo

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1258 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index 39d9a15..08fc3ba 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -111,6 +111,9 @@ class munin::client::gentoo inherits munin::client::base {
         name => 'munin',
         category => 'net-analyzer',
     }
+    File["/etc/munin/munin-node.conf"]{
+			content => template("munin/munin-node.conf.$operatingsystem"),
+    }
 
 	include munin::plugins::gentoo
 }
-- 
cgit v1.2.3


From 6bc29ac288bcc25dec161a96679f1ac872f11837 Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Fri, 25 Apr 2008 10:43:41 +0000
Subject: another try to fix this problem

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1261 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index 08fc3ba..2208b8d 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -59,7 +59,7 @@ class munin::client::base {
 			ensure => directory,
 			mode => 0755, owner => root, group => 0;
 		"/etc/munin/munin-node.conf":
-			content => template("munin/munin-node.conf.$operatingsystem.$lsbdistcodename"),
+			content => template("munin/munin-node.conf.$operatingsystem"),
 			mode => 0644, owner => root, group => 0,
 			# this has to be installed before the package, so the postinst can
 			# boot the munin-node without failure!
@@ -99,6 +99,9 @@ class munin::client::debian inherits munin::client::base {
 		# sarge's munin-node init script has no status
 		hasstatus => $lsbdistcodename ? { sarge => false, default => true }
 	}
+    File["/etc/munin/munin-node.conf"]{
+			content => template("munin/munin-node.conf.$operatingsystem"),
+    }
 	# workaround bug in munin_node_configure
 	plugin { "postfix_mailvolume": ensure => absent }
 	include munin::plugins::debian
@@ -111,9 +114,7 @@ class munin::client::gentoo inherits munin::client::base {
         name => 'munin',
         category => 'net-analyzer',
     }
-    File["/etc/munin/munin-node.conf"]{
-			content => template("munin/munin-node.conf.$operatingsystem"),
-    }
+    
 
 	include munin::plugins::gentoo
 }
-- 
cgit v1.2.3


From 561b770f24a688842bfad68143826aefd8ab1fd0 Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Fri, 25 Apr 2008 11:03:45 +0000
Subject: forgot lsbdistcodename in debian

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1262 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index 2208b8d..b2bad8b 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -1,6 +1,7 @@
 # client.pp - configure a munin node
 # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at>
 # See LICENSE for the full license granted to you.
+# Adapted and improved by admin(at)immerda.ch
 
 class munin::client {
 
@@ -100,7 +101,7 @@ class munin::client::debian inherits munin::client::base {
 		hasstatus => $lsbdistcodename ? { sarge => false, default => true }
 	}
     File["/etc/munin/munin-node.conf"]{
-			content => template("munin/munin-node.conf.$operatingsystem"),
+			content => template("munin/munin-node.conf.$operatingsystem.$lsbdistcodename"),
     }
 	# workaround bug in munin_node_configure
 	plugin { "postfix_mailvolume": ensure => absent }
-- 
cgit v1.2.3


From e80b4c9f2aff54318f2f3338ef23b73a3a40a58c Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Fri, 25 Apr 2008 11:37:59 +0000
Subject: antoher try to fix the problem

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1264 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index b2bad8b..8305bf0 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -55,11 +55,11 @@ class munin::client::base {
         hasrestart => true,
         require => Package[munin-node],
 	}
-	file {
-		"/etc/munin/":
+	file {"/etc/munin/":
 			ensure => directory,
 			mode => 0755, owner => root, group => 0;
-		"/etc/munin/munin-node.conf":
+    }
+    file {"/etc/munin/munin-node.conf":
 			content => template("munin/munin-node.conf.$operatingsystem"),
 			mode => 0644, owner => root, group => 0,
 			# this has to be installed before the package, so the postinst can
-- 
cgit v1.2.3


From 876a2769f2c48979202ed03bbb7baeb0ebde14e1 Mon Sep 17 00:00:00 2001
From: Marcel Haerry <haerry@puzzle.ch>
Date: Tue, 29 Apr 2008 17:50:40 +0200
Subject: enabled munin client

---
 manifests/client.pp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index 8305bf0..bee3609 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -51,6 +51,7 @@ class munin::client::base {
 	package { "munin-node": ensure => installed }
 	service { "munin-node":
 		ensure => running, 
+        enable => true,
         hasstatus => true,
         hasrestart => true,
         require => Package[munin-node],
-- 
cgit v1.2.3


From 013317ba7744477be001bb3850f69ec37cc1540b Mon Sep 17 00:00:00 2001
From: Marcel Haerry <haerry@puzzle.ch>
Date: Mon, 26 May 2008 11:21:28 +0200
Subject: made munin_allow a lot more scalable

---
 manifests/client.pp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'manifests/client.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index bee3609..59b6980 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -60,6 +60,10 @@ class munin::client::base {
 			ensure => directory,
 			mode => 0755, owner => root, group => 0;
     }
+    $real_munin_allow = $munin_allow ? {
+        '' => '127.0.0.1',
+        default => $munin_allow
+    }
     file {"/etc/munin/munin-node.conf":
 			content => template("munin/munin-node.conf.$operatingsystem"),
 			mode => 0644, owner => root, group => 0,
-- 
cgit v1.2.3