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

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  heininen -> squeeze Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
  luca updated his email address
  lindeberg to squeeze
  duarte to squeeze
  some more machines to squeeze

diff --combined config/nagios-master.cfg
index e5f702e,11ca7ce..8b786e0
--- 1/config/nagios-master.cfg
--- 2/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@@ -257,7 -257,7 +257,7 @@@ servers
    heininen:
      address: 82.195.75.98
      parents: gw-man-da
-     hostgroups: computers, acpid-hosts, service
+     hostgroups: computers, acpid-hosts, service, squeeze
    nielsen:
      address: 82.195.75.99
      parents: gw-man-da
@@@ -330,7 -330,7 +330,7 @@@
    rietz:
      address: 140.211.166.43
      parents: gw-osuosl
 -    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, hasvicepa
 +    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, hasvicepa, squeeze
      #, bosserver
    rietz2:
      address: 140.211.166.44
@@@ -535,7 -535,7 +535,7 @@@
    duarte:
      address: 206.12.19.114
      parents: dijkstra
-     hostgroups: computers, hasbootfs, hassrvfs, apache2-hosts, kvmdomains, service
+     hostgroups: computers, hasbootfs, hassrvfs, apache2-hosts, kvmdomains, service, squeeze
    valente:
      address: 206.12.19.112
      parents: dijkstra
@@@ -603,7 -603,7 +603,7 @@@
    traetta:
      address: 206.12.19.21
      parents: tchaikovsky
-     hostgroups: computers, dl585, acpid-hosts, service
+     hostgroups: computers, dl585, acpid-hosts, service, squeeze
    schuetz:
      address: 206.12.19.119
      parents: tchaikovsky
@@@ -719,7 -719,7 +719,7 @@@
    cilea:
      address: 194.177.211.205
      parents: gw-grnet
-     hostgroups: computers, acpid-hosts, mptraid, hassrvfs, service
+     hostgroups: computers, acpid-hosts, mptraid, hassrvfs, service, squeeze
    vitry:
      address: 194.177.211.206
      parents: gw-grnet
@@@ -762,7 -762,7 +762,7 @@@
    lindberg:
      address: 86.59.118.149
      parents: gw-sil
-     hostgroups: computers, acpid-hosts, service, apache2-hosts
+     hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze
      # which raid?
  
    abel: