X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fexim%2Ftemplates%2Fvirtualdomains.erb;h=dc7358296049019be265f31f15077a5893ce15fc;hb=dcd630f1f5c57cb6c1bc5c65f76825c7be3dc827;hp=0b0ee69b98e81977830ecbc45d20c9b6e39253c4;hpb=2af4fea97a715c71827b21daf365227c67d4d9ca;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 0b0ee69b9..dc7358296 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -7,8 +7,6 @@ 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"
 
@@ -25,6 +23,9 @@ ftp-master.debian.org: user=dak group=debadmin directory=/srv/ftp-master.debian.
         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.gr: user=nobody group=Debian directory=/srv/star.debian.star/
+debian.us: user=nobody group=Debian directory=/srv/star.debian.star/
+debian.es: user=nobody group=Debian directory=/srv/star.debian.star/
 debian.eu: user=nobody group=Debian directory=/srv/star.debian.star/"
 
         when "nono.debian.org" then "nm.debian.org: user=nm group=nm directory=/srv/nm.debian.org/mail/"
@@ -53,4 +54,5 @@ vdoms
 %>
 <% if classes.include?("roles::mailrelay") -%>
 debian.org: user=nobody group=Debian directory=/etc/exim4/email-virtualdomains/debian.org/mail
+admin.debian.org: user=mail_admin group=mail_admin directory=/etc/exim4/email-virtualdomains/admin.debian.org/mail
 <% end -%>