X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fvirtualdomains.erb;h=0504b8830085e150632e1d040d0e3b967817e636;hb=f78fe2ebc3f173a92f385e5fcea1c26c3c404025;hp=90156d27303359d6d634461135e4f87508c5974f;hpb=f9c803574237cef7d1dc120866b04254b2dcf367;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 90156d273..0504b8830 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -19,8 +19,6 @@
 <%=
 vdoms = case scope.lookupvar('::fqdn')
 
-        when "bellini.debian.org" then "popcon.debian.org: user=popcon group=popcon directory=/org/popcon.debian.org/mail/"
-
         when "busoni.debian.org" then "bugs.debian.org: user=debbugs group=debbugs directory=/srv/bugs.debian.org/mail"
         when "buxtehude.debian.org" then "bugs.debian.org: user=debbugs group=debbugs directory=/srv/bugs.debian.org/mail"
 
@@ -42,12 +40,10 @@ 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 "master.debian.org" then "vote.debian.org: user=secretary group=debvote directory=/org/vote.debian.org/mail
-bugs.qa.debian.org: user=cjwatson group=qa directory=/org/bugs.qa.debian.org/mail
-debian.org: user=debian group=Debian directory=/org/debian.org/mail
-debian.com: user=nobody group=Debian directory=/org/star.debian.star/
-debian.net: user=nobody group=Debian directory=/org/star.debian.star/
-debian.eu: user=nobody group=Debian directory=/org/star.debian.star/"
+        when "master.debian.org" then "debian.org: user=debian group=Debian directory=/srv/debian.org/mail
+debian.com: user=nobody group=Debian directory=/srv/star.debian.star/
+debian.net: user=nobody group=Debian directory=/srv/star.debian.star/
+debian.eu: user=nobody group=Debian directory=/srv/star.debian.star/"
 
         when "morricone.debian.org" then "backports.debian.org: user=dak group=backports directory=/srv/backports-master.debian.org/mail/"