From: Stephen Gran <steve@lobefin.net>
Date: Sat, 25 Apr 2009 16:40:01 +0000 (+0100)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c4e5e19d9fb914cb340fd84632d3cc2a10f13957;hp=c259537ae6810b5ca9ec69e3d7eb5194e965af18;p=mirror%2Fdsa-puppet.git

Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
---

diff --git a/manifests/site.pp b/manifests/site.pp
index b6f884d32..094c4181e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -9,12 +9,17 @@ File {
     ensure  => file,
 }
 
+Exec {
+    path => "/usr/bin:/usr/sbin:/bin:/sbin"
+}
+
 node default {
     include munin-node
     include sudo
     include debian-org
     include monit
     include motd
+    include samhain
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -26,20 +31,14 @@ node default {
         default:   {}
     }
 
-    import "nagios"
-    include nagios-client
-
-    case $hostname {
-        morales:   {}
-        default:   { include samhain }
-    }
 
     case $hostname {
-        spohr:     {
-                      import "nagios"
-                      include nagios-server
-                   }
-        default:   {}
+        spohr: {
+                      include nagios::server
+        }
+        default: {
+		      include nagios::client
+	}
     }
 
     case $apache2 {
diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index f8726866f..9fedde753 100644
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -4,7 +4,7 @@ class motd {
                 content => template("motd.erb") ;
 	}
         exec { "updatemotd":
-                command => "/bin/uname -snrvm > /var/run/motd && /bin/cat /etc/motd.tail >> /var/run/motd",
+                command => "uname -snrvm > /var/run/motd && cat /etc/motd.tail >> /var/run/motd",
                 refreshonly => true
         }
 }
diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
new file mode 100644
index 000000000..d32345132
--- /dev/null
+++ b/modules/nagios/manifests/client.pp
@@ -0,0 +1,44 @@
+class nagios::client inherits nagios {
+	package {
+		dsa-nagios-nrpe-config: ensure => purged;
+		dsa-nagios-checks: ensure => installed;
+	}
+
+	file {
+		"/etc/default/nagios-nrpe-server":
+			source  => [ "puppet:///nagios/per-host/$fqdn/default",
+			             "puppet:///nagios/common/default" ],
+			require => Package["nagios-nrpe-server"],
+			notify  => Exec["nagios-nrpe-server restart"];
+		"/etc/default/nagios-nrpe":
+			ensure  => absent,
+			notify  => Exec["nagios-nrpe-server restart"];
+		"/etc/nagios/nrpe.cfg":
+			source  => [ "puppet:///nagios/per-host/$fqdn/nrpe.cfg",
+			             "puppet:///nagios/common/nrpe.cfg" ],
+			require => Package["nagios-nrpe-server"],
+			notify  => Exec["nagios-nrpe-server restart"];
+		"/etc/nagios/nrpe.d":
+			mode    => 755,
+			ensure  => directory;
+		"/etc/nagios/nrpe.d/debianorg.cfg":
+			source  => [ "puppet:///nagios/per-host/$fqdn/inc-debian.org",
+			             "puppet:///nagios/common/inc-debian.org" ],
+			require => Package["nagios-nrpe-server"],
+			notify  => Exec["nagios-nrpe-server restart"];
+		"/etc/nagios/nrpe.d/nrpe_dsa.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/generated/nrpe_dsa.cfg" ],
+			require => Package["dsa-nagios-checks"],
+			notify  => Exec["nagios-nrpe-server restart"];
+
+		"/etc/nagios/obsolete-packages-ignore":
+			source  => [ "puppet:///nagios/per-host/$fqdn/obsolete-packages-ignore",
+			             "puppet:///nagios/common/obsolete-packages-ignore" ],
+			require => Package["dsa-nagios-checks"];
+	}
+
+	exec { "nagios-nrpe-server restart":
+		path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+		refreshonly => true,
+	}
+}
diff --git a/modules/nagios/manifests/init.pp b/modules/nagios/manifests/init.pp
index 64502aac2..13c0dc911 100644
--- a/modules/nagios/manifests/init.pp
+++ b/modules/nagios/manifests/init.pp
@@ -1,127 +1,5 @@
-class nagios-client {
+class nagios {
 	package {
 		nagios-nrpe-server: ensure => installed;
-		dsa-nagios-nrpe-config: ensure => purged;
-		dsa-nagios-checks: ensure => installed;
-	}
-
-	file {
-		"/etc/default/nagios-nrpe-server":
-			source  => [ "puppet:///nagios/per-host/$fqdn/default",
-			             "puppet:///nagios/common/default" ],
-			require => Package["nagios-nrpe-server"],
-			notify  => Exec["nagios-nrpe-server restart"];
-		"/etc/default/nagios-nrpe":
-			ensure  => absent,
-			notify  => Exec["nagios-nrpe-server restart"];
-		"/etc/nagios/nrpe.cfg":
-			source  => [ "puppet:///nagios/per-host/$fqdn/nrpe.cfg",
-			             "puppet:///nagios/common/nrpe.cfg" ],
-			require => Package["nagios-nrpe-server"],
-			notify  => Exec["nagios-nrpe-server restart"];
-		"/etc/nagios/nrpe.d":
-			mode    => 755,
-			ensure  => directory;
-		"/etc/nagios/nrpe.d/debianorg.cfg":
-			source  => [ "puppet:///nagios/per-host/$fqdn/inc-debian.org",
-			             "puppet:///nagios/common/inc-debian.org" ],
-			require => Package["nagios-nrpe-server"],
-			notify  => Exec["nagios-nrpe-server restart"];
-		"/etc/nagios/nrpe.d/nrpe_dsa.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/generated/nrpe_dsa.cfg" ],
-			require => Package["dsa-nagios-checks"],
-			notify  => Exec["nagios-nrpe-server restart"];
-
-		"/etc/nagios/obsolete-packages-ignore":
-			source  => [ "puppet:///nagios/per-host/$fqdn/obsolete-packages-ignore",
-			             "puppet:///nagios/common/obsolete-packages-ignore" ],
-			require => Package["dsa-nagios-checks"];
-	}
-
-	exec { "nagios-nrpe-server restart":
-		path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-		refreshonly => true,
-	}
-}
-
-class nagios-server {
-	package {
-		nagios3: ensure => installed;
-		nagios-nrpe-plugin: ensure => installed;
-		nagios-plugins: ensure => installed;
-		nagios-images: ensure => installed;
-	}
-
-	file {
-		"/etc/nagios-plugins/config/local-dsa-checkcommands.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/static/checkcommands.cfg" ],
-			require => Package["nagios3"],
-			notify  => Exec["nagios3 reload"];
-
-		"/etc/nagios3/cgi.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/static/cgi.cfg" ],
-			require => Package["nagios3"],
-			notify  => Exec["nagios3 reload"];
-		"/etc/nagios3/nagios.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/static/nagios.cfg" ],
-			require => Package["nagios3"],
-			notify  => Exec["nagios3 reload"];
-
-		"/etc/nagios3/puppetconf.d":
-			mode    => 755,
-			ensure  => directory;
-
-		"/etc/nagios3/puppetconf.d/contacts.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/contacts.cfg" ],
-			require => Package["nagios3"],
-			notify  => Exec["nagios3 reload"];
-		"/etc/nagios3/puppetconf.d/generic-host.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/generic-host.cfg" ],
-			require => Package["nagios3"],
-			notify  => Exec["nagios3 reload"];
-		"/etc/nagios3/puppetconf.d/generic-service.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/generic-service.cfg" ],
-			require => Package["nagios3"],
-			notify  => Exec["nagios3 reload"];
-		"/etc/nagios3/puppetconf.d/timeperiods.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/timeperiods.cfg" ],
-			require => Package["nagios3"],
-			notify  => Exec["nagios3 reload"];
-
-		"/etc/nagios3/puppetconf.d/auto-dependencies.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-dependencies.cfg" ],
-			require => Package["nagios3"],
-			notify  => Exec["nagios3 reload"];
-		"/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-hostextinfo.cfg" ],
-			require => Package["nagios3"],
-			notify  => Exec["nagios3 reload"];
-		"/etc/nagios3/puppetconf.d/auto-hostgroups.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-hostgroups.cfg" ],
-			require => Package["nagios3"],
-			notify  => Exec["nagios3 reload"];
-		"/etc/nagios3/puppetconf.d/auto-hosts.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-hosts.cfg" ],
-			require => Package["nagios3"],
-			notify  => Exec["nagios3 reload"];
-		"/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-serviceextinfo.cfg" ],
-			require => Package["nagios3"],
-			notify  => Exec["nagios3 reload"];
-		"/etc/nagios3/puppetconf.d/auto-servicegroups.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-servicegroups.cfg" ],
-			require => Package["nagios3"],
-			notify  => Exec["nagios3 reload"];
-		"/etc/nagios3/puppetconf.d/auto-services.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-services.cfg" ],
-			require => Package["nagios3"],
-			notify  => Exec["nagios3 reload"];
-
-	}
-
-	exec { "nagios3 reload":
-		path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-		refreshonly => true,
 	}
 }
-
diff --git a/modules/nagios/manifests/server.pp b/modules/nagios/manifests/server.pp
new file mode 100644
index 000000000..39a48ff39
--- /dev/null
+++ b/modules/nagios/manifests/server.pp
@@ -0,0 +1,80 @@
+class nagios::server inherits nagios::client {
+	package {
+		nagios3: ensure => installed;
+		nagios-nrpe-plugin: ensure => installed;
+		nagios-plugins: ensure => installed;
+		nagios-images: ensure => installed;
+	}
+
+	file {
+		"/etc/nagios-plugins/config/local-dsa-checkcommands.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/static/checkcommands.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+
+		"/etc/nagios3/cgi.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/static/cgi.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+		"/etc/nagios3/nagios.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/static/nagios.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+
+		"/etc/nagios3/puppetconf.d":
+			mode    => 755,
+			ensure  => directory;
+
+		"/etc/nagios3/puppetconf.d/contacts.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/contacts.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+		"/etc/nagios3/puppetconf.d/generic-host.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/generic-host.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+		"/etc/nagios3/puppetconf.d/generic-service.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/generic-service.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+		"/etc/nagios3/puppetconf.d/timeperiods.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/timeperiods.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+
+		"/etc/nagios3/puppetconf.d/auto-dependencies.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-dependencies.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+		"/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-hostextinfo.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+		"/etc/nagios3/puppetconf.d/auto-hostgroups.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-hostgroups.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+		"/etc/nagios3/puppetconf.d/auto-hosts.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-hosts.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+		"/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-serviceextinfo.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+		"/etc/nagios3/puppetconf.d/auto-servicegroups.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-servicegroups.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+		"/etc/nagios3/puppetconf.d/auto-services.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-services.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+
+	}
+
+	exec { "nagios3 reload":
+		path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+		refreshonly => true,
+	}
+}