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 02734f80020cf064b5b7c045b1ff395adc6a9d3e..73fa57520097d0316bf88fe015579f6ca3674d94 100644 (file)
--- 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 0e57849a4d57a9d985f25cb232fca49866717a08..7b6813f2482c2e9b075197ced7750a3f199b2dcd 100644 (file)
--- 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 dde41520b08fa7b2d8de3a91ca7b015e96417bcf..4447d4692e0ccf709969faa384a760d0233af5c5 100644 (file)
--- 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