From: Peter Palfrader Date: Wed, 23 Apr 2014 16:16:27 +0000 (+0200) Subject: There is no @keyring.debian.org mail X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=123a9d74fd810f4da8f1a03d81ca81eea6d98d25 There is no @keyring.debian.org mail --- diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb index 3522f84d..19063fb5 100644 --- 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 50a54ba4..9ebe3ebc 100644 --- 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/