X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fexim%2Ftemplates%2Fvirtualdomains.erb;h=f2ae4d501850f50b26bc70681b8d3842c555b2e1;hb=d5aa695b724a15c751b4347d6ed894c371fb01db;hp=7296d175e45896ce89f85f7869d6e842fa263c17;hpb=34017d07929662aa40a511cf9993cbf33a70ace7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 7296d175e..f2ae4d501 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -1,7 +1,6 @@
 <%=
 vdoms = case @fqdn
 
-        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"
 
         when "chopin.debian.org" then "security.debian.org: user=mail_security group=nogroup directory=/srv/security-master.debian.org/mail/"
@@ -40,8 +39,6 @@ packages.qa.debian.org: user=qa group=qa directory=/srv/packages.qa.debian.org/m
 
 	when "reger.debian.org" then "rt.debian.org: user=rt group=rt directory=/srv/rt.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"
 
         when "tye.debian.org" then "i18n.debian.org: user=debian-i18n group=debian-i18n directory=/srv/i18n.debian.org/mail
@@ -53,3 +50,6 @@ l10n.debian.org: user=debian-i18n group=debian-i18n directory=/srv/l10n.debian.o
 end
 vdoms
 %>
+<% if classes.include?("roles::mailrelay") -%>
+debian.org: user=nobody group=Debian directory=/etc/exim4/email-virtualdomains/debian.org/mail
+<% end -%>