From: Stephen Gran <steve@lobefin.net>
Date: Fri, 16 Oct 2009 23:12:53 +0000 (+0100)
Subject: Merge branch 'master' of ssh://db.debian.org/org/db.debian.org/git/dsa-nagios
X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=b7f262355ef855bc2119eeaf059a32687e5faad8;p=mirror%2Fdsa-nagios.git

Merge branch 'master' of ssh://db.debian.org/org/db.debian.org/git/dsa-nagios
---

b7f262355ef855bc2119eeaf059a32687e5faad8
diff --cc config/nagios-master.cfg
index 0575534,60e7de3..f78c3ae
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@@ -1620,8 -1620,20 +1620,8 @@@ services
      name: network service - http
      check: check_http
      depends: kassia:process - apache2 - master
-     hosts: kassia-sec, kassia-ftp
+     hosts: kassia-sec, kassia-ftp, kassia-volatile
  
 -
 -  # apache1 process on merkel
 -  -
 -    name: process - apache - master
 -    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C apache -a /usr/sbin/apache"
 -    hosts: merkel
 -  -
 -    name: process - apache - worker
 -    nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:75 -c 1:150 -u www-data -C apache -a /usr/sbin/apache"
 -    hosts: merkel
 -    depends: process - apache - master
 -
    # keyserver on raff
    -
      name: network service - http keyserver