From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 4 May 2009 10:26:05 +0000 (+0200)
Subject: No more apache, bind9, xinetd, finger, https on samosa
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7224bd381fa03fd519f5493fe4892681218cbb05;p=mirror%2Fdsa-nagios.git

No more apache, bind9, xinetd, finger, https on samosa
---

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index ceb7194..828e2d9 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -173,7 +173,7 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: spohr
-    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, heavy-exim, lenny, hasvarfs, hasusrfs
+    hostgroups: computers, no-udev, service, dl380, heavy-exim, lenny, hasvarfs, hasusrfs
   raff:
     address: 192.25.206.59
     parents: spohr
@@ -1482,7 +1482,7 @@ services:
   -
     name: process - slapd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:20 -c 1:50 -u openldap -C slapd -a '/usr/sbin/slapd -h ldap:/// ldaps:/// -g openldap -u openldap'"
-    hosts: samosa, draghi
+    hosts: draghi
  ###
   -
     name: process - ulogd
@@ -1518,19 +1518,19 @@ services:
   -
     name: process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xinetd -a '/usr/sbin/xinetd -pidfile /var/run/xinetd.pid -stayalive'"
-    hosts: samosa, allegri, gluck, zelenka, ancina, draghi
+    hosts: allegri, gluck, zelenka, ancina, draghi
     hostgroups: rsyncd-hosts
   -
     name: unwanted process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
     hostgroups: computers
-    excludehosts: samosa, allegri, gluck, zelenka, ancina, draghi
+    excludehosts: allegri, gluck, zelenka, ancina, draghi
     excludehostgroups: rsyncd-hosts
  ###
   -
     name: network service - finger
     check: check_tcp!79
-    hosts: samosa, draghi
+    hosts: draghi
     depends: process - xinetd
  ###
   -
@@ -1605,13 +1605,13 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: samosa, ries, klecker, draghi
+    hosts: ries, klecker, draghi
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
     name: network service - https cert
     check: dsa_check_cert!443
-    hosts: samosa, ries, klecker, spohr2, draghi
+    hosts: ries, klecker, spohr2, draghi
     depends: network service - https
     normal_check_interval: 60