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

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  secure 29.172.in-addr.arpa
  By default unbound answers queries for ASN112 networks on its own.  Teach it to behave.
  Forward reverse lookups to our nameservers
  s/org/srv/
  pick up some other useful rules
  this should make picconi handle mail
  1&1 cleanup
  \%, not %%
  qa-core sudo to qa-web-rolex
  %%, not %&
  Use %%, not % in cron.d file

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 09ce6a0..8a8b2bf 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -433,6 +433,10 @@ file=/etc/ferm/conf.d/defs.conf
 file=/etc/ferm/ferm.conf
 dir=2/etc/ssl/debian
 file=/etc/unbound/unbound.conf
+<% if scope.lookupvar('::fqdn') == "draghi.debian.org" -%>
+file=/etc/openvpn/deb-mgmt-clients.pool
+<% end -%>
+
 
 <% if scope.lookupvar('site::nodeinfo')['puppetmaster'] %>