There is no @keyring.debian.org mail

diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb
index 3522f84d06b4a51cdebbfd59e6e9f1d735b22b69..19063fb5ebdfe0ab034097fd75c62de667504fe3 100644 (file)
--- a/modules/exim/templates/manualroute.erb
+++ b/modules/exim/templates/manualroute.erb
@@ -15,7 +15,7 @@ extraroutes = []
 if scope.function_has_role(['mailrelay'])
   mxmatches << 'mailout.debian.org'
   mxmatches << 'INCOMING-MX'
-  extraroutes = [ "keyring.debian.org:\t\tkaufmann.debian.org" ]
+  extraroutes = [ ]
   extraroutes << "www-master.debian.org:\t\twolkenstein.debian.org"
 end
 

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 50a54ba4909fde89e397e979186770dda912b1f9..9ebe3ebc6115354694b767b72f398b934392c0ae 100644 (file)
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -14,8 +14,6 @@ vdoms = case @fqdn
 
         when "handel.debian.org" then "puppet.debian.org: user=sgran group=Debian directory=/srv/puppet.debian.org/mail"
 
-        when "kaufmann.debian.org" then "keyring.debian.org: user=keyring group=Debian directory=/srv/keyring.debian.org/mail"
-
         when "master.debian.org" then "debian.com: user=nobody group=Debian directory=/srv/star.debian.star/
 debian.net: user=nobody group=Debian directory=/srv/star.debian.star/
 debian.gr: user=nobody group=Debian directory=/srv/star.debian.star/