X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=6d1ef02b10e5ca71a45240df21aedc016a29dbed;hb=4da676dfd2a2955277eac2ea52bdf150908b862a;hp=0b6fe04870a8a8221639456cc65e8656c191d3e7;hpb=327c5dd675b80f2231d5c3d05333f2d7ae917f61;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 0b6fe04..6d1ef02 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -64,7 +64,7 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
   gw-dg-i.net:
-    address: 195.49.152.190
+    address: 93.94.130.190
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
     contacts: bzed
@@ -180,7 +180,7 @@ servers:
   merkel:
     address: 192.25.206.16
     parents: samosa
-    hostgroups: computers, general, apache1-hosts, apache2-hosts, bind9-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny, puppet
+    hostgroups: computers, general, apache1-hosts, apache2-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny, puppet
   spohr:
     address: 192.25.206.33
     parents: samosa
@@ -221,7 +221,7 @@ servers:
   sperger:
     address: 82.195.75.98
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, hasbootfs, lenny
+    hostgroups: computers, porterbox, sw-raid, hasbootfs, lenny, puppet
     contacts: bzed
   agricola:
     address: 82.195.75.86
@@ -274,11 +274,11 @@ servers:
   mayer:
     address: 140.211.166.78
     parents: gw-osuosl
-    hostgroups: computers, no-udev, buildd, hasbootfs
+    hostgroups: computers, buildd, hasbootfs, lenny, puppet
   mayr:
     address: 140.211.166.58
     parents: gw-osuosl
-    hostgroups: computers, no-udev, buildd, hasbootfs
+    hostgroups: computers, buildd, hasbootfs, lenny, puppet
   malo:
     address: 140.211.166.27
     parents: gw-osuosl
@@ -1781,10 +1781,6 @@ services:
     name: mirror sync - security.us
     check: "dsa_check_mirrorsync!security.us.debian.org!project/trace/security-master.debian.org"
     hosts: global
-  -
-    name: DNS SOA sync - debprivate-ftcollins.debian.org
-    check: "dsa_check_soas!debprivate-ftcollins.debian.org"
-    hosts: global
   -
     name: DNS SOA sync - debian.org
     check: "dsa_check_soas_add!samosa.debian.org!debian.org"