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

* 'master' of git+ssh://db.debian.org/git/dsa-nagios: (31 commits)
  add load to dependencies for nrpe checks
  no more liszt
  decommission heininen (RT#3870)
  new thresholds for /srv/mirrors
  Add a license to dsa-update-apt-status
  Exclude all freebsd hosts from ekey stunnel stuff
  Add falla
  Add fischer
  hoiby is a buildd now
  Create a hostgroup for hosts with a /var/log, and also add sibelius to that group
  /srv/snapshot.debian.org special casing on stabile
  Replace heininen with lully
  Add lully
  Ignore home/buildd/build-trees for du checks
  retire hebden (RT#3819)
  oops, missing dep
  consolidate ftp checks
  bizet no longer has vsftpd listener
  morricone no longer has vsftpd listener
  gluck no longer has vsftpd listener
  ...

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index fc9d663..7b0235e 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -798,14 +798,14 @@ servers:
     address: 206.12.19.126
     parents: traetta
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, xinetd-hosts, autofs
-#  dukas:
-#    address: 206.12.19.128
-#    parents: traetta
-#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs
-#  tye:
-#    address: 206.12.19.129
-#    parents: traetta
-#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, autofs, hassrvfs
+  dukas:
+    address: 206.12.19.128
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs
+  tye:
+    address: 206.12.19.129
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, autofs, hassrvfs
   elgar:
     address: 206.12.19.130
     parents: salieri