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

diff --git a/config/Makefile b/config/Makefile
index bbe7a4e..59347b6 100644 (file)
--- a/config/Makefile
+++ b/config/Makefile
@@ -8,6 +8,6 @@ clean:
        rm -rf generated
 
 install: generated/nrpe_dsa.cfg
-       rsync -Pravz --delete generated static handel.debian.org:/etc/puppet/modules/nagios/files/dsa-nagios
+       rsync -Prltvz --delete generated static handel.debian.org:/etc/puppet/modules/nagios/files/dsa-nagios
 
 .PHONY: all deb

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 4f784f2..5fa2bb2 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -156,6 +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 @@ servers:
     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 @@ servers:
     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 @@ servers:
     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
 #