Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios

* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  piatti to squeeze
  I can't believe that has ever worked

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 5e2090c..4112a46 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -795,6 +795,11 @@ servers:
     parents: gw-ynic
     hostgroups: computers, buildd, sw-raid, hassrvfs
 
+  santoro:
+    addresses: 200.17.202.197
+    parents: tchaikovsky
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze
+
 #############################
 # host groups
 #