projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rsync-ssh-wrap: also allow uploads to SecurityUploadQueue
[mirror/dsa-puppet.git]
/
modules
/
exim
/
templates
/
eximconf.erb
diff --git
a/modules/exim/templates/eximconf.erb
b/modules/exim/templates/eximconf.erb
index
8281867
..
05d79fb
100644
(file)
--- a/
modules/exim/templates/eximconf.erb
+++ b/
modules/exim/templates/eximconf.erb
@@
-220,7
+220,7
@@
ports = []
out = "daemon_smtp_ports = "
ports << 25
out = "daemon_smtp_ports = "
ports << 25
-if @is_bugsm
aster or @is_bugsm
x
+if @is_bugsmx
ports << 587
end
ports << 587
end
@@
-317,7
+317,7
@@
acl_getprofile:
accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}}
<%- end -%>
accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}}
<%- end -%>
-<%- if @is_bugsm
aster or @is_bugsm
x -%>
+<%- if @is_bugsmx -%>
warn domains = bugs.debian.org
set acl_m_rprf = BugsMail
warn domains = bugs.debian.org
set acl_m_rprf = BugsMail
@@
-782,7
+782,11
@@
check_recipient:
protocol_name=${uc:$received_protocol}\n\
instance=${acl_m_grey}\n\
helo_name=${sender_helo_name}\n\
protocol_name=${uc:$received_protocol}\n\
instance=${acl_m_grey}\n\
helo_name=${sender_helo_name}\n\
+<%- if scope.call_function('versioncmp', [@lsbmajdistrelease, '8']) <= 0 -%>
client_address=${substr_-3:${mask:$sender_host_address/24}}\n\
client_address=${substr_-3:${mask:$sender_host_address/24}}\n\
+<%- else -%>
+ client_address=${sender_host_address}\n\
+<%- end -%>
client_name=${sender_host_name}\n\
sender=${sender_address}\n\
recipient=$local_part@$domain\n\n
client_name=${sender_host_name}\n\
sender=${sender_address}\n\
recipient=$local_part@$domain\n\n
@@
-1464,11
+1468,8
@@
virt_users:
<%=
out = ""
<%=
out = ""
-if @is_bugsm
aster or @is_bugsm
x
+if @is_bugsmx
domain = 'bugs.debian.org'
domain = 'bugs.debian.org'
- if @is_bugsmaster
- domain = 'bugs-master.debian.org'
- end
out = '
# This router delivers for bugs.d.o
bugs:
out = '
# This router delivers for bugs.d.o
bugs:
@@
-1618,7
+1619,7
@@
bsmtp:
{$value}fail}\
}}
{$value}fail}\
}}
-<%- if @is_bugsm
aster or @is_bugsm
x -%>
+<%- if @is_bugsmx -%>
bugs_pipe:
driver = pipe
command = /srv/bugs.debian.org/mail/run-procmail
bugs_pipe:
driver = pipe
command = /srv/bugs.debian.org/mail/run-procmail