From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 23 Jul 2009 20:59:39 +0000 (+0200)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=10cf512bc6430fe30d85447ffa2bf5b11c74e9d8;hp=da2ecce802c0e374b251464986f65bc26350f9be;p=mirror%2Fdsa-puppet.git

Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  some printf debugging
  add log message
  Make postmasterish mails go to d-a.
  Allow blacklists
  Discard mails when asked to
  please to be quiet, zelenka
---

diff --git a/modules/nagios/files/per-host/draghi.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/draghi.debian.org/obsolete-packages-ignore.d-hostspecific
new file mode 100644
index 000000000..77890c1e3
--- /dev/null
+++ b/modules/nagios/files/per-host/draghi.debian.org/obsolete-packages-ignore.d-hostspecific
@@ -0,0 +1,6 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+userdir-ldap