From: zacheiss <zacheiss>
Date: Thu, 17 Apr 2008 17:24:36 +0000 (+0000)
Subject: Changes for Nagios 3.
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/92bd4d0daf539030cd50763586e6c0bf5c01e253

Changes for Nagios 3.
---

diff --git a/gen/nagios-colo.gen b/gen/nagios-colo.gen
index c98c5ea7..8c0f9148 100755
--- a/gen/nagios-colo.gen
+++ b/gen/nagios-colo.gen
@@ -40,6 +40,7 @@ define host{
 	host_name		$name
 	alias			$name
 	address			$name
+	contact_groups          colo,dost
 	use			generic-host
 	}
 
@@ -74,7 +75,6 @@ END
 define hostgroup{
         hostgroup_name          colo-hosts
         alias                   colo-hosts
-        contact_groups          colo,dost
 END
 
 print OUT "\tmembers\t\t\t";
diff --git a/gen/nagios-printers.gen b/gen/nagios-printers.gen
index 88d3d656..adb48d28 100755
--- a/gen/nagios-printers.gen
+++ b/gen/nagios-printers.gen
@@ -33,6 +33,7 @@ define host{
 	host_name		$name
 	alias			$name
 	address			$name
+	contact_groups          ops-printers
 	use			generic-host
 	}
 
@@ -82,7 +83,6 @@ print OUT <<END;
 define hostgroup{
         hostgroup_name          printers
         alias                   printers
-        contact_groups          ops-printers
 END
 
 print OUT "\tmembers\t\t";
diff --git a/gen/nagios-wsh.gen b/gen/nagios-wsh.gen
index c33e559b..caf7abf8 100755
--- a/gen/nagios-wsh.gen
+++ b/gen/nagios-wsh.gen
@@ -40,6 +40,7 @@ define host{
 	host_name		$name
 	alias			$name
 	address			$name
+	contact_groups          wsh
 	use			generic-host
 	}
 
@@ -208,7 +209,6 @@ END
 define hostgroup{
         hostgroup_name          wsh-hosts
         alias                   wsh-hosts
-        contact_groups          wsh
 END
 
 print OUT "\tmembers\t\t\t";