[project @ peter@palfrader.org-20090303091202-i9bbsff1lbsnksb7]

merge

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 2677cdd..034fc29 100644 (file)
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -317,7 +317,7 @@ servers:
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, single-cpu, lenny, puppet, rsyslog-hosts
+    hostgroups: computers, apache2-hosts, sw-raid, single-cpu, lenny, puppet, rsyslog-hosts, acpid-hosts
     contacts: bzed
 
   pergolesi:
@@ -386,7 +386,7 @@ servers:
   caballero:
     address: 193.201.200.200
     parents: gw-blackcat
-    hostgroups: computers, no-udev, buildd, sw-raid, lenny
+    hostgroups: computers, no-udev, buildd, sw-raid, lenny, puppet
 
   elara:
     address: 67.210.160.90