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:
  raff doesn't have enough disk to do the usual daemon log for bind
  and on the way in
  penalosa is a buildd and gets mail relay

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 0edba35..1812b0b 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -189,6 +189,7 @@ host_settings:
     morales.debian.org: mailout.debian.org
     murphy.debian.org: mailout.debian.org
     paer.debian.org: mailout.debian.org
+    penalosa.debian.org: mailout.debian.org
     pergolesi.debian.org: mailout.debian.org
     pescetti.debian.org: mailout.debian.org
     piatti.debian.org: mailout.debian.org

diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb
index f2fbd5b..6170a61 100644 (file)
--- a/modules/exim/templates/manualroute.erb
+++ b/modules/exim/templates/manualroute.erb
@@ -31,6 +31,7 @@ merulo.debian.org:            merulo.debian.org::25
 morales.debian.org:            morales.debian.org::25
 murphy.debian.org:              murphy.debian.org::25
 paer.debian.org:                paer.debian.org::25
+penalosa.debian.org:            penalosa.debian.org::25
 pergolesi.debian.org:          pergolesi.debian.org::25
 pescetti.debian.org:           pescetti.debian.org::25
 piatti.debian.org:              piatti.debian.org::2025

diff --git a/modules/munin-node/templates/munin-node.plugin.conf.erb b/modules/munin-node/templates/munin-node.plugin.conf.erb
index 0a3f2c9..1790558 100644 (file)
--- a/modules/munin-node/templates/munin-node.plugin.conf.erb
+++ b/modules/munin-node/templates/munin-node.plugin.conf.erb
@@ -79,7 +79,7 @@ group maillog
 [bind*]
 <%=
 out = case hostname
-  when "geo1","geo2","geo3" then "group bind
+  when "geo1","geo2","geo3","raff" then "group bind
 env.logfile /var/log/bind9/geoip-query.log"
   else "group adm"
 end