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

diff --combined config/nagios-master.cfg
index 74e835d,db42930..dfb9c2b
--- 1/config/nagios-master.cfg
--- 2/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@@ -168,6 -168,10 +168,10 @@@ servers
      address: 86.59.118.145
      parents: gw-ubc
      hostgroups: routing-infrastructure
+   gw-arm:
+     address: 82.44.141.46
+     parents: gw-ubc
+     hostgroups: routing-infrastructure
  
    global:
      hostgroups: notacomputer
@@@ -482,7 -486,7 +486,7 @@@
    spontini:
      address: 206.12.19.14
      parents: gw-ubc
 -    hostgroups: computers, buildd, hasbootfs, hassrvfs
 +    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc
      contacts: lfilipoz
    ravel:
      address: 206.12.19.5
@@@ -708,6 -712,30 +712,30 @@@
      hostgroups: computers, acpid-hosts
      # which raid?
  
+   abel:
+     address: 217.140.96.56
+     parents: gw-arm
+     hostgroups: computers
+   arnold:
+     address: 217.140.96.57
+     parents: gw-arm
+     hostgroups: computers
+   alain:
+     address: 217.140.96.58
+     parents: gw-arm
+     hostgroups: computers
+   alwyn:
+     address: 217.140.96.59
+     parents: gw-arm
+     hostgroups: computers
+   antheil:
+     address: 217.140.96.60
+     parents: gw-arm
+     hostgroups: computers
+   arne:
+     address: 217.140.96.61
+     parents: gw-arm
+     hostgroups: computers
  
  #############################
  # host groups