X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fvirtualdomains.erb;h=50a54ba4909fde89e397e979186770dda912b1f9;hb=3d7d6d150b1ee791a9b16e8c670b17183280efd6;hp=3292c7f98bafcbf6da121d6bab90161b6e2c70f7;hpb=c4e401c9464862b4987da1f2fd0e7d5d870cda0b;p=dsa-puppet.git

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 3292c7f9..50a54ba4 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -3,16 +3,12 @@ vdoms = case @fqdn
 
         when "buxtehude.debian.org" then "bugs.debian.org: user=debbugs group=debbugs directory=/srv/bugs.debian.org/mail"
 
-        when "chopin.debian.org" then "security.debian.org: user=mail_security group=nogroup directory=/srv/security-master.debian.org/mail/"
-
         when "draghi.debian.org" then "db.debian.org: user=mail_db group=nogroup directory=/srv/db.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 "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 "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"
 
@@ -20,10 +16,11 @@ ftp-master.debian.org: user=dak group=debadmin directory=/srv/ftp-master.debian.
 
         when "kaufmann.debian.org" then "keyring.debian.org: user=keyring group=Debian directory=/srv/keyring.debian.org/mail"
 
-        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/
+        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/"
@@ -39,8 +36,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"
 
@@ -51,6 +46,8 @@ end
 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
+debian.org: user=nobody group=Debian directory=/etc/exim4/email-virtualdomains/debian.org
+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
 <% end -%>