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

diff --combined config/nagios-master.cfg
index f4c1eb5,4b9a971..703b5f4
--- 1/config/nagios-master.cfg
--- 2/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@@ -172,6 -172,10 +172,10 @@@ servers
      address: 82.44.141.46
      parents: gw-ubc
      hostgroups: routing-infrastructure
+   gw-ynic:
+     address: 144.32.168.65
+     parents: gw-ubc
+     hostgroups: routing-infrastructure
  
    global:
      hostgroups: notacomputer
@@@ -715,27 -719,36 +719,36 @@@
    abel:
      address: 217.140.96.56
      parents: gw-arm
-     hostgroups: computers
+     hostgroups: computers, hasbootfs, hassrvfs, porterbox
    arnold:
      address: 217.140.96.57
      parents: gw-arm
-     hostgroups: computers
+     hostgroups: computers, hasbootfs, hassrvfs
    alain:
      address: 217.140.96.58
      parents: gw-arm
-     hostgroups: computers
+     hostgroups: computers, hasbootfs, hassrvfs
    alwyn:
      address: 217.140.96.59
      parents: gw-arm
-     hostgroups: computers
+     hostgroups: computers, hasbootfs, hassrvfs
    antheil:
      address: 217.140.96.60
      parents: gw-arm
-     hostgroups: computers
+     hostgroups: computers, hasbootfs, hassrvfs
    arne:
      address: 217.140.96.61
      parents: gw-arm
-     hostgroups: computers
+     hostgroups: computers, hasbootfs, hassrvfs
+ 
+   poulenc:
+     address: 144.32.168.77
+     parents: gw-ynic
+     hostgroups: computers, buildd, sw-raid, hassrvfs
+   porpora:
+     address: 144.32.168.78
+     parents: gw-ynic
+     hostgroups: computers, buildd, sw-raid, hassrvfs
  
  #############################
  # host groups
@@@ -1166,11 -1179,6 +1179,11 @@@ services
      nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/ferm.conf"
      hostgroups: computers
      excludehostgroups: freebsd
 +  -
 +    name: puppetized firewall
 +    nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/conf.d/defs.conf"
 +    hostgroups: computers
 +    excludehostgroups: freebsd
  
   ####
    -