projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the www.d.o apache config a template
[mirror/dsa-puppet.git]
/
modules
/
exim
/
templates
/
eximconf.erb
diff --git
a/modules/exim/templates/eximconf.erb
b/modules/exim/templates/eximconf.erb
index
1be6b7e
..
5c9f8bb
100644
(file)
--- a/
modules/exim/templates/eximconf.erb
+++ b/
modules/exim/templates/eximconf.erb
@@
-115,6
+115,8
@@
domainlist bsmtp_domains = ${if exists {/etc/exim4/bsmtp}{partial-lsearch;/etc/e
domainlist handled_domains = +local_domains : +virtual_domains : +bsmtp_domains
domainlist handled_domains = +local_domains : +virtual_domains : +bsmtp_domains
+domainlist ourself_and_handled = $primary_hostname : +handled_domains
+
localpartlist local_only_users = lsearch;/etc/exim4/localusers
localpartlist postmasterish = postmaster : abuse : hostmaster
localpartlist local_only_users = lsearch;/etc/exim4/localusers
localpartlist postmasterish = postmaster : abuse : hostmaster
@@
-557,7
+559,7
@@
check_recipient:
drop !hosts = +debianhosts
!acl = acl_spamlovers
drop !hosts = +debianhosts
!acl = acl_spamlovers
- condition = ${if match_domain{$sender_helo_name}{
$primary_hostname:+handled_domains
}}
+ condition = ${if match_domain{$sender_helo_name}{
+ourself_and_handled
}}
condition = ${if !match{$sender_host_name}{${rxquote:$sender_helo_name}\N$\N}}
message = HELO mismatch Forged HELO for ($sender_helo_name)
condition = ${if !match{$sender_host_name}{${rxquote:$sender_helo_name}\N$\N}}
message = HELO mismatch Forged HELO for ($sender_helo_name)
@@
-1319,11
+1321,11
@@
packages:
file_transport = address_file
pipe_transport = address_pipe
domains = packages.debian.org
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}"
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
check_ancestor
retry_use_local_part
no_more