spohr does not handle RT any more

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index bdffddb..1f6ae3d 100644 (file)
--- 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 151a95c..f72331e 100644 (file)
--- 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"