X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=e73b54aeeda0f6cb3ac9d76dffceb3da622f0dfd;hb=86a7bcbeee830d5371bd76df8391ed70d3f1e8a3;hp=5a1d3748d918893a37fc740f5c70d38f66465b5a;hpb=4278bacc41a5331fe574985c0268649225c8f879;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 5a1d374..e73b54a 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -171,10 +171,6 @@ servers:
     address: 87.106.64.223
     parents: gw-1und1
     hostgroups: computers, service, jessie
-  pkgmirror-1and1:
-    address: 213.165.95.4
-    parents: powell
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https
   # }}}
   # {{{ gw-1und1-sec
   schumann:
@@ -515,7 +511,7 @@ servers:
   mirror-anu:
     address: 150.203.164.39
     parents: gw-cecsit
-    hostgroups: computers, service, apache2-hosts, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, security_mirror, apache-https
+    hostgroups: computers, service, apache2-hosts, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, apache-https
   mirror-anu2:
     address: 150.203.164.60
     parents: mirror-anu
@@ -523,13 +519,17 @@ servers:
   mirror-anu3:
     address: 150.203.164.61
     parents: mirror-anu
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, security_mirror
   mirror-anu4:
     address: 150.203.164.62
     parents: mirror-anu
     hostgroups: secondary-IPs
   # }}}
   # {{{ gw-conova
+  aagaard:
+    address: 217.196.149.227
+    parents: gw-conova
+    hostgroups: computers, jessie, service, sw-raid
   # }}}
   # {{{ gw-csail
   steffani:
@@ -1050,7 +1050,7 @@ servers:
   gretchaninov:
     address: 209.87.16.36
     parents: ubc-gateway
-    hostgroups: computers, general, kvmdomains, jessie, hassrvfs, nfs-server, apache2-hosts
+    hostgroups: computers, general, kvmdomains, jessie, hassrvfs, nfs-server, apache2-hosts, xinetd-hosts
   tye:
     address: 209.87.16.37
     parents: ubc-gateway