projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
[mirror/dsa-puppet.git]
/
modules
/
exim
/
templates
/
virtualdomains.erb
diff --git
a/modules/exim/templates/virtualdomains.erb
b/modules/exim/templates/virtualdomains.erb
index
4103139
..
2fb06cc
100644
(file)
--- a/
modules/exim/templates/virtualdomains.erb
+++ b/
modules/exim/templates/virtualdomains.erb
@@
-20,7
+20,6
@@
vdoms = case fqdn
when "gluck.debian.org" then "ddtp.debian.org: user=grisu group=Debian directory=/org/ddtp.debian.org/mail
vdoms = case fqdn
when "gluck.debian.org" then "ddtp.debian.org: user=grisu group=Debian directory=/org/ddtp.debian.org/mail
-admin.debian.org: user=mail_admin group=mail_admin directory=/org/admin.debian.org/mail/
popcon.debian.org: user=popcon group=popcon directory=/org/popcon.debian.org/mail/
debian.com: user=nobody group=Debian directory=/org/misc/star.debian.org/
popcon.debian.org: user=popcon group=popcon directory=/org/popcon.debian.org/mail/
debian.com: user=nobody group=Debian directory=/org/misc/star.debian.org/
@@
-52,7
+51,8
@@
ftp-master.debian.org: user=dak group=debadmin directory=/srv/ftp.debian.org/mai
when "draghi.debian.org" then "db.debian.org: user=mail_db group=nogroup directory=/srv/db.debian.org/mail"
when "draghi.debian.org" then "db.debian.org: user=mail_db group=nogroup directory=/srv/db.debian.org/mail"
- when "spohr.debian.org" then "rt.debian.org: user=rt group=rt directory=/srv/rt.debian.org/mail"
+ when "spohr.debian.org" then "rt.debian.org: user=rt group=rt directory=/srv/rt.debian.org/mail
+admin.debian.org: user=mail_admin group=mail_admin directory=/org/admin.debian.org/mail/"
when "tartini.debian.org" then "forums.debian.net: user=forums group=forums directory=/srv/forums.debian.net/mail"
when "tartini.debian.org" then "forums.debian.net: user=forums group=forums directory=/srv/forums.debian.net/mail"