X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=7f2765bf29ce303751655fcf6ed1d71b4bff02e1;hb=a5fef2e8a96a9a33376cec38d7d50d1802528a78;hp=52d5917b6b9f87496fb7840727eb55d984c1001d;hpb=e4f3e2ccdbbe9db8f76d23d0713cf2934961f947;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 52d5917..7f2765b 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -286,7 +286,7 @@ servers:
   senfter:
     address: 5.153.231.4
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, no-bacula
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, no-bacula, apache-https
   adayevskaya:
     address: 5.153.231.5
     parents: gw-bytemark
@@ -523,7 +523,7 @@ servers:
   draghi:
     address: 82.195.75.106
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, wheezy
+    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, wheezy
   geo1:
     address: 82.195.75.105
     parents: ganeti3
@@ -565,13 +565,13 @@ servers:
   zani:
     address: 148.100.88.22
     parents: gw-marist
-    hostgroups: computers, buildd, hassrvfs, wheezy
+    hostgroups: computers, buildd, hassrvfs, wheezy, incomingmailrelayed
   # }}}
   # {{{ gw-osuosl
   busoni:
     address: 140.211.15.34
     parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, wheezy, hasvarlogfs, apache2-hosts, no-bacula
+    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, wheezy, hasvarlogfs, apache2-hosts, no-bacula, apache-https
   byrd:
     address: 140.211.166.20
     parents: gw-osuosl
@@ -600,7 +600,7 @@ servers:
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, wheezy, bind9-hosts
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, wheezy
     #, bosserver
   rietz2:
     address: 140.211.166.44
@@ -898,6 +898,14 @@ servers:
     address: 130.89.148.12
     parents: klecker
     hostgroups: secondary-IPs
+  klecker-archive:
+    address: 130.89.148.13
+    parents: klecker
+    hostgroups: secondary-IPs
+  klecker-static:
+    address: 130.89.148.14
+    parents: klecker
+    hostgroups: secondary-IPs
   # }}}
   # {{{ gw-ynic
   hildegard:
@@ -1860,11 +1868,11 @@ services:
     check: dsa_check_smtp
     hostgroups: postfix-hosts
     depends: process - postfix - master
-#  -
-#    name: network service - submission
-#    check: dsa_check_smtp_port!587
-#    hostgroups: incomingmailrelayed
-#    depends: process - exim
+  -
+    name: network service - submission
+    check: dsa_check_smtp_port!587
+    hostgroups: incomingmailrelayed
+    depends: process - exim
   -
     name: network service - smtp 2025
     check: dsa_check_smtp_port!2025