X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fvirtualdomains.erb;h=1f1d057b57a01ada255d77b43aecf4c596652ce6;hb=5efc285f2986f21e78be720e31160a7a818cc5ee;hp=9e156f21317897b75736862b56da18dbaed75920;hpb=5fb448ea07a8a9aacdac60ee3a1bb7d3127d1300;p=dsa-puppet.git

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 9e156f21..1f1d057b 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -7,22 +7,10 @@ vdoms = case @fqdn
 
         when "franck.debian.org" then "release.debian.org: user=release group=debian-release directory=/org/release.debian.org/mail"
 
-        when "gombert.debian.org" then "gobby.debian.org: user=gobby group=gobby directory=/srv/gobby.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"
 
-        when "kaufmann.debian.org" then "keyring.debian.org: user=keyring group=Debian directory=/srv/keyring.debian.org/mail"
-
-        when "master.debian.org" then "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/"
 
 	when "picconi.debian.org" then "packages.debian.org: user=pkg_user group=Debian directory=/srv/packages.debian.org/mail/"
@@ -36,8 +24,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 "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
 l10n.debian.org: user=debian-i18n group=debian-i18n directory=/srv/l10n.debian.org/mail"
 
@@ -52,4 +38,11 @@ debian.org: user=nobody group=Debian directory=/etc/exim4/email-virtualdomains/d
 admin.debian.org: user=mail_admin group=mail_admin directory=/etc/exim4/email-virtualdomains/admin.debian.org
 ftp-master.debian.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/ftp-master.debian.org
 security.debian.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/security.debian.org
+
+debian.com: user=nobody group=Debian directory=/etc/exim4/email-virtualdomains/debian.star/
+debian.net: user=nobody group=Debian directory=/etc/exim4/email-virtualdomains/debian.star/
+debian.gr: user=nobody group=Debian directory=/etc/exim4/email-virtualdomains/debian.star/
+debian.us: user=nobody group=Debian directory=/etc/exim4/email-virtualdomains/debian.star/
+debian.es: user=nobody group=Debian directory=/etc/exim4/email-virtualdomains/debian.star/
+debian.eu: user=nobody group=Debian directory=/etc/exim4/email-virtualdomains/debian.star/
 <% end -%>