have special vhost for security now, that we do geodns

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index ae01444..38a2972 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -499,6 +499,10 @@ servers:
     address: 137.82.84.79
     parents: gw-ubc
     hostgroups: computers, lenny, hasbootfs, nfs-client, hassrvfs, aacraid
+  morricone:
+    address: 137.82.84.81
+    parents: gw-ubc
+    hostgroups: computers, lenny, hasbootfs, hassrvfs, aacraid, postgres83-hosts, ftpd-hosts, rsyncd-hosts
   stabile:
     address: 137.82.84.72
     parents: gw-ubc
@@ -924,7 +928,7 @@ services:
  ####
   -
     name: puppet
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -i 300 -f /var/lib/puppet/state/state.yaml"
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -i 540 -f /var/lib/puppet/state/state.yaml"
     hostgroups: lenny
     excludehosts: agnesi
 
@@ -1837,15 +1841,7 @@ services:
     hosts: global
   -
     name: mirror sync - security
-    check: "dsa_check_mirrorsync!security.debian.org!project/trace/security-master.debian.org"
-    hosts: global
-  -
-    name: mirror sync - security.eu
-    check: "dsa_check_mirrorsync!security.eu.debian.org!project/trace/security-master.debian.org"
-    hosts: global
-  -
-    name: mirror sync - security.us
-    check: "dsa_check_mirrorsync!security.us.debian.org!project/trace/security-master.debian.org"
+    check: "dsa_check_mirrorsync!security-nagios.debian.org!project/trace/security-master.debian.org"
     hosts: global
   -
     name: mirror sync - packages