From: Stephen Gran Date: Sat, 20 Apr 2013 09:35:12 +0000 (+0100) Subject: s/org/srv/ X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=a576c8137feaea3598c4f70ed7e01953027c386e s/org/srv/ Signed-off-by: Stephen Gran --- diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index 9aef9459..5c9f8bb2 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -1321,11 +1321,11 @@ packages: file_transport = address_file pipe_transport = address_pipe domains = packages.debian.org - require_files = /org/packages.debian.org/conf/maintainer - data = ${lookup{$local_part}cdb{/org/packages.debian.org/conf/maintainer.cdb}} + require_files = /srv/packages.debian.org/conf/maintainer + data = ${lookup{$local_part}cdb{/srv/packages.debian.org/conf/maintainer.cdb}} headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}" - transport_home_directory = /org/packages.debian.org/mail - transport_current_directory = /org/packages.debian.org/mail + transport_home_directory = /srv/packages.debian.org/mail + transport_current_directory = /srv/packages.debian.org/mail check_ancestor retry_use_local_part no_more diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb index ddef78ef..627db680 100644 --- a/modules/exim/templates/virtualdomains.erb +++ b/modules/exim/templates/virtualdomains.erb @@ -47,7 +47,7 @@ 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=/org/packages.debian.org/mail/" + when "picconi.debian.org" then "packages.debian.org: user=pkg_user group=Debian directory=/srv/packages.debian.org/mail/" when "popov.debian.org" then "popcon.debian.org: user=popcon group=popcon directory=/srv/popcon.debian.org/mail/"