From: Stephen Gran <steve@lobefin.net>
Date: Mon, 16 Apr 2012 19:58:41 +0000 (+0100)
Subject: some cleanups
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4f238d34eb3ebf2109afe1eeaa387024f603ff91;p=mirror%2Fdsa-puppet.git

some cleanups

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 02734f800..73fa57520 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -336,6 +336,7 @@ host_settings:
     rossini.debian.org: mailout.debian.org
     saens.debian.org: mailout.debian.org
     salieri.debian.org: mailout.debian.org
+    samosa.debian.org: mailout.debian.org
     santoro.debian.org: mailout.debian.org
     scelsi.debian.org: mailout.debian.org
     schein.debian.org: mailout.debian.org
diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb
index 0e57849a4..7b6813f24 100644
--- a/modules/exim/templates/manualroute.erb
+++ b/modules/exim/templates/manualroute.erb
@@ -5,7 +5,7 @@
 ## Format:
 ## domain: hostname[::port] options
 ## example:
-## buildd.debian.org: raff.debian.org::587 byname
+## buildd.debian.org: grieg.debian.org::587 byname
 
 <%=
 mxmatches = [ fqdn ]
diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index dde41520b..4447d4692 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -69,8 +69,6 @@ packages.qa.debian.org: user=qa group=qa directory=/srv/packages.qa.debian.org/m
 
         when "tye.debian.org" then "i18n.debian.org: user=debian-i18n group=debian-i18n directory=/srv/i18n.debian.org/mail"
 
-        when "valente.debian.org" then "volatile.debian.org: user=volatile group=volatile directory=/srv/volatile-master.debian.org/mail"
-
         when "wolkenstein.debian.org" then "www-master.debian.org: user=debwww group=debwww directory=/srv/www.debian.org/mail/"
 end
 vdoms