keyring is on kaufmann, not raff

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 586be17..70a9405 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -196,12 +196,12 @@ servers:
   peri:
     address: 192.25.206.15
     parents: spohr
-    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny, single-cpu
     contacts: dannf
   penalosa:
     address: 192.25.206.68
     parents: spohr
-    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny, single-cpu
     contacts: dannf
   mundy:
     address: 192.25.206.62
@@ -516,6 +516,18 @@ servers:
     address: 137.82.84.80
     parents: gw-ubc
     hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs
+  paganini:
+    address: 137.82.84.82
+    parents: gw-ubc
+    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs
+  respighi:
+    address: 137.82.84.83
+    parents: gw-ubc
+    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs
+  vivaldi:
+    address: 137.82.84.84
+    parents: gw-ubc
+    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -1610,14 +1622,14 @@ services:
   -
     name: network service - http keyserver
     check: dsa_check_http_port!11371
-    hosts: raff
+    hosts: kaufmann
     depends: process - apache2 - master
 
   # https on various hosts
   -
     name: network service - https
     check: check_https
-    hosts: ries, klecker, draghi, liszt, spohr, tartini
+    hosts: ries, klecker, draghi, liszt, spohr, widor
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -1630,7 +1642,7 @@ services:
     # draghi           db.debian.org
     # merkel2          nm.debian.org
     # liszt            lists.debian.org
-    hosts: ries, klecker, spohr, spohr2, draghi, merkel2, liszt, tartini
+    hosts: ries, klecker, spohr, spohr2, draghi, merkel2, liszt, widor
     depends: network service - https
     normal_check_interval: 60