X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=67c39714c92430532799e3b2dac4e46361d9ed53;hb=b7db53fed703005a6ecfbabddc72f037dd954641;hp=76560cfa3484b819d7e7e285eafe4e38c18b3e36;hpb=45c7f1ea6f838c11ac466cf8c6d47738a407497b;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 76560cf..67c3971 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -662,7 +662,7 @@ servers:
   cilea:
     address: 194.177.211.205
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid
+    hostgroups: computers, acpid-hosts, mptraid, hassrvfs
   vitry:
     address: 194.177.211.206
     parents: gw-grnet
@@ -1745,11 +1745,11 @@ services:
     check: check_tcp!873
     hosts: rietz2
     depends: rietz:process - xinetd
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hosts: kassia-sec
-    depends: kassia:process - xinetd
+  #-
+  #  name: network service - rsync
+  #  check: check_tcp!873
+  #  hosts: kassia-sec
+  #  depends: kassia:process - xinetd
   -
     name: network service - rsync
     check: check_tcp!873
@@ -1784,7 +1784,8 @@ services:
     name: network service - http
     check: check_http
     depends: kassia:process - apache2 - master
-    hosts: kassia-sec, kassia-ftp, kassia-volatile
+    #hosts: kassia-sec, kassia-ftp, kassia-volatile
+    hosts: kassia-ftp, kassia-volatile
 
   # keyserver on kaufmann
   -
@@ -1863,7 +1864,8 @@ services:
   -
     name: network service - ftp
     check: check_ftp
-    hosts: kassia-sec, kassia-ftp
+    #hosts: kassia-sec, kassia-ftp
+    hosts: kassia-ftp
     depends: kassia:process - xinetd
 
  ####
@@ -2048,10 +2050,6 @@ services:
     normal_check_interval: 15
     max_check_attempts: 5
     retry_check_interval: 5
-  -
-    name: DNS SOA sync - security.geo.debian.org
-    check: "dsa_check_soas!security.geo.debian.org"
-    hosts: global
   -
     name: DNS SOA sync - debian.org
     check: "dsa_check_soas_add!draghi.debian.org!debian.org"
@@ -2095,12 +2093,12 @@ services:
   -
     name: DNS SEC - signature expiry
     hosts: global
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-zone-rrsig-expiration-many --warn 20d --critical 7d /var/cache/bind/git/domains"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-zone-rrsig-expiration-many --warn 20d --critical 7d --geozonedir /srv/dns.debian.org/geo/zones /srv/dns.debian.org/var/gitdns/domains"
     runfrom: draghi
   -
     name: DNS SEC - delegations
     hosts: global
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-dnssec-delegation --dir /var/cache/bind/git/domains check-header"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-dnssec-delegation --dir /srv/dns.debian.org/var/gitdns/domains --dir /srv/dns.debian.org/geo/zones check-header"
     runfrom: draghi
 
  ############