Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

diff --git a/modules/exim/files/per-host/raff.debian.org/virtualdomains b/modules/exim/files/per-host/raff.debian.org/virtualdomains
index a2bc3b1..644f57f 100644 (file)
--- a/modules/exim/files/per-host/raff.debian.org/virtualdomains
+++ b/modules/exim/files/per-host/raff.debian.org/virtualdomains
@@ -1,5 +1,4 @@
 # This file lists the virtual domains that this host should handle. The
 # format is
 #  host: user=user group=group directory=dir
-ftp-master.debian.org: user=dak group=debadmin directory=/srv/ftp.debian.org/mail group_writable=true
 buildd.debian.org: user=wbadm group=wbadm directory=/srv/buildd.debian.org/mail

diff --git a/modules/exim/files/per-host/ries.debian.org/virtualdomains b/modules/exim/files/per-host/ries.debian.org/virtualdomains
index 81fed3b..b98e047 100644 (file)
--- a/modules/exim/files/per-host/ries.debian.org/virtualdomains
+++ b/modules/exim/files/per-host/ries.debian.org/virtualdomains
@@ -2,3 +2,4 @@
 # format is
 #  host: user=user group=group directory=dir
 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.debian.org/mail group_writable=true