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

diff --combined config/nagios-master.cfg
index 4f784f2,e76c61d..5fa2bb2
--- 1/config/nagios-master.cfg
--- 2/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@@ -156,6 -156,10 +156,10 @@@ servers
      address: 130.239.18.97
      parents: gw-HP-ftc
      hostgroups: routing-infrastructure
+   gw-esiee:
+     address: 147.215.2.249
+     parents: gw-HP-ftc
+     hostgroups: routing-infrastructure
  
    global:
      hostgroups: notacomputer
@@@ -389,6 -393,10 +393,10 @@@
      address: 195.20.242.124
      parents: schumann
      hostgroups: computers, ulogd-hosts, lenny, puppet, rsyslog-hosts, hassrvfs
+   geo3:
+     address: 195.20.242.125
+     parents: schumann
+     hostgroups: computers, service, lenny, hasbootfs, puppet, rsyslog-hosts, single-cpu
  
    caballero:
      address: 193.201.200.200
@@@ -464,6 -472,10 +472,10 @@@
      address: 137.82.84.74
      parents: dijkstra
      hostgroups: computers, lenny, puppet, buildd, hasbootfs, hassrvfs
+   geo2:
+     address: 137.82.84.71
+     parents: dijkstra
+     hostgroups: computers, service, lenny, hasbootfs, puppet, rsyslog-hosts, single-cpu
  
    lebrun:
      address: 193.198.184.10
@@@ -519,6 -531,11 +531,11 @@@
      parents: gw-aca
      hostgroups: computers, buildd, rsyslog-hosts, lenny, puppet
  
+   lafayette:
+     address: 147.215.7.160
+     parents: gw-esiee
+     hostgroups: computers, buildd, lenny, puppet, sw-raid, hassrvfs, hasbootfs
+ 
  #############################
  # host groups
  #
@@@ -1293,11 -1310,6 +1310,11 @@@ services
      hostgroups: postfix-hosts
      excludehosts: verdi, kassia, allegri, piatti
      depends: process - postfix - master
 +  -
 +    name: network service - submission
 +    check: dsa_check_smtp_port!587
 +    hosts: lafayette
 +    depends: process - exim
    -
      name: network service - smtp - port 2025
      check: dsa_check_smtp_port!2025