From: Stephen Gran Date: Sat, 4 Sep 2010 11:13:38 +0000 (+0100) Subject: no more non-us X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e0ff4b91cd5514753f95e569a08dfcc7c771c455;p=mirror%2Fdsa-puppet.git no more non-us Signed-off-by: Stephen Gran --- diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb index d7cfb08b4..e724e2711 100644 --- a/modules/exim/templates/virtualdomains.erb +++ b/modules/exim/templates/virtualdomains.erb @@ -37,8 +37,7 @@ ftp-master.debian.org: user=dak group=debadmin directory=/srv/ftp-master.debian. when "kaufmann.debian.org" then "keyring.debian.org: user=keyring group=Debian directory=/srv/keyring.debian.org/mail" - when "klecker.debian.org" then "non-us.debian.org: user=katie group=debadmin directory=/org/non-us.debian.org/mail/ -www-master.debian.org: user=debwww group=debwww directory=/org/www.debian.org/mail/" + when "klecker.debian.org" then "www-master.debian.org: user=debwww group=debwww directory=/org/www.debian.org/mail/" when "master.debian.org" then "vote.debian.org: user=secretary group=debvote directory=/org/vote.debian.org/mail packages.qa.debian.org: user=qa group=qa directory=/org/packages.qa.debian.org/mail