X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fvirtualdomains.erb;h=59f492050168a5caf6d8e8689dfc0b42ca2ac0a5;hb=e4818dbab72dc4aaeb120b3dbae082f99f8b83d7;hp=14f53d694aece8a649932356fa53398438838757;hpb=8c565e6c184971235629c7f66aeac987f10c23ce;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 14f53d694..59f492050 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -7,14 +7,11 @@ vdoms = case @fqdn
 
         when "wuiet.debian.org" then "buildd.debian.org: user=wbadm group=wbadm directory=/srv/buildd.debian.org/mail"
 
-        when "handel.debian.org" then "puppet.debian.org: user=sgran group=Debian directory=/srv/puppet.debian.org/mail"
-
         when "nono.debian.org" then "nm.debian.org: user=nm group=nm directory=/srv/nm.debian.org/mail/"
 
 	when "picconi.debian.org" then "packages.debian.org: user=pkg_user group=Debian directory=/srv/packages.debian.org/mail/"
 
         when "pinel.debian.org" then "popcon.debian.org: user=popcon group=popcon directory=/srv/popcon.debian.org/mail/"
-        when "popov.debian.org" then "popcon.debian.org: user=popcon group=popcon directory=/srv/popcon.debian.org/mail/"
 
         when "quantz.debian.org" then "qa.debian.org: user=qa group=qa directory=/srv/qa.debian.org/mail/
 packages.qa.debian.org: user=qa group=qa directory=/srv/packages.qa.debian.org/mail"
@@ -38,6 +35,11 @@ ftp-master.debian.org: user=nobody group=nogroup directory=/etc/exim4/email-virt
 security.debian.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/security.debian.org
 women.debian.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/women.debian.org
 release.debian.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/release.debian.org
+ports-master.debian.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/ports-master.debian.org
+
+debian-ports.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian-ports.org
+
+debconf.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debconf.org
 
 debian.com: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian.star
 debian.net: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian.star
@@ -45,5 +47,6 @@ debian.gr: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/d
 debian.us: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian.star
 debian.es: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian.star
 debian.eu: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian.star
+debian.nl: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian.star
 debian.org.tw: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian.star
 <% end -%>