[project @ steve@lobefin.net-20090224171509-rfrwkl7brkzpls8f]

Update my branch to match master

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 56e5145..9519b29 100644 (file)
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -322,7 +322,7 @@ servers:
   bruckner:
     address: 62.104.23.253
     parents: gw-freenet
-    hostgroups: computers, no-udev, porterbox, single-cpu
+    hostgroups: computers, no-udev, porterbox, single-cpu, no-samhain
 
   raptor:
     address: 195.243.109.162
@@ -366,7 +366,7 @@ servers:
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts
+    hostgroups: computers, service, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, lenny
     contacts: joerg
 
   schumann:
@@ -452,7 +452,7 @@ servers:
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasbootfs
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
 
   tartini:
     address: 82.94.249.158
@@ -468,7 +468,7 @@ servers:
   rem:
     address: 195.71.99.217
     parents: gw-telefonica
-    hostgroups: computers, buildd, hasbootfs
+    hostgroups: computers, buildd, hasbootfs, lenny
 
   ball:
     address: 78.32.9.213