From: Martin Zobel-Helas Date: Sat, 8 Jan 2011 13:02:57 +0000 (+0100) Subject: spohr does not handle RT any more X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=22130755a260e3913af6c24858a7275ee49fcf3a;p=mirror%2Fdsa-puppet.git spohr does not handle RT any more Signed-off-by: Martin Zobel-Helas --- diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index bdffddbe7..1f6ae3d5c 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -135,7 +135,6 @@ services: puppetmaster: handel.debian.org qamaster: merkel.debian.org rtmaster: - - spohr.debian.org - reger.debian.org host_settings: heavy_exim: diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb index 151a95cf2..f72331e36 100644 --- a/modules/exim/templates/virtualdomains.erb +++ b/modules/exim/templates/virtualdomains.erb @@ -58,8 +58,7 @@ debian.net: user=nobody group=Debian directory=/org/star.debian.star/" when "reger.debian.org" then "rt.debian.org: user=rt group=rt directory=/srv/rt.debian.org/mail" - when "spohr.debian.org" then "rt.debian.org: user=rt group=rt directory=/srv/rt.debian.org/mail -admin.debian.org: user=mail_admin group=mail_admin directory=/org/admin.debian.org/mail/" + when "spohr.debian.org" then admin.debian.org: user=mail_admin group=mail_admin directory=/org/admin.debian.org/mail/" when "tartini.debian.org" then "forums.debian.net: user=forums group=forums directory=/srv/forums.debian.net/mail"