X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fvirtualdomains.erb;h=f2ae4d501850f50b26bc70681b8d3842c555b2e1;hb=b1c57d74d65300c3a0ab989cd820a0a19022c427;hp=ac8d59e128b9d9acb7e7b054608ca0454b5dfc35;hpb=d73dbb40ee999702ecf818449d5f60d7b9bea0de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index ac8d59e12..f2ae4d501 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -39,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
@@ -52,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 -%>