X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fvirtualdomains.erb;h=b8bce8c43d009b72af6cef4db80e73b14c56bdbf;hb=f02b03d7591719c38fab82817edca551f5895a72;hp=48b581bcf986279450c09362b1d5289310739080;hpb=b4cb1b1c8b6900dabfb28bc5d9f15d6c16172f0a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 48b581bcf..b8bce8c43 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -7,14 +7,13 @@ vdoms = case @fqdn
 
         when "draghi.debian.org" then "db.debian.org: user=mail_db group=nogroup directory=/srv/db.debian.org/mail"
 
-        when "dukas.debian.org" then "ddtp.debian.org: user=ddtp group=ddtp directory=/srv/ddtp.debian.org/mail/"
-
         when "franck.debian.org" then "release.debian.org: user=release group=debian-release directory=/org/release.debian.org/mail
 ftp-master.debian.org: user=dak group=debadmin directory=/srv/ftp-master.debian.org/mail group_writable=true"
 
         when "gombert.debian.org" then "gobby.debian.org: user=gobby group=gobby directory=/srv/gobby.debian.org/mail"
 
         when "grieg.debian.org" then "buildd.debian.org: user=wbadm group=wbadm directory=/srv/buildd.debian.org/mail"
+        when "wuiet.debian.org" then "buildd.debian.org: user=wbadm group=wbadm directory=/srv/buildd.debian.org/mail"
 #logs.buildd.debian.org: user=wbadm group=wbadm directory=/srv/logs.buildd.debian.org/mail"
 
         when "handel.debian.org" then "puppet.debian.org: user=sgran group=Debian directory=/srv/puppet.debian.org/mail"
@@ -50,3 +49,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 -%>