X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Feximconf.erb;h=cdd7f9baeff182fe9b2f1b50aa6025d033fa0283;hb=95eab19f797ba51c063f207d471763918b7f3e1e;hp=8281867844b83868d2ea1a8bcabfb2a090e47e9c;hpb=4f14632836804e153148f2be6fa081e815cb12ce;p=mirror%2Fdsa-puppet.git diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index 828186784..cdd7f9bae 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -220,7 +220,7 @@ ports = [] out = "daemon_smtp_ports = " ports << 25 -if @is_bugsmaster or @is_bugsmx +if @is_bugsmx ports << 587 end @@ -243,7 +243,7 @@ pipelining_advertise_hosts = !* tls_advertise_hosts = * smtp_enforce_sync = true -log_selector = +tls_cipher +tls_peerdn +queue_time +deliver_time +smtp_connection +smtp_incomplete_transaction +smtp_confirmation +log_selector = +tls_cipher +tls_peerdn +queue_time +deliver_time +smtp_connection +smtp_incomplete_transaction +smtp_confirmation +smtp_protocol_error received_header_text = Received: ${if def:sender_rcvhost {from $sender_rcvhost\n\t}\ {${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)\n\t}}}}\ @@ -267,7 +267,9 @@ GREYLIST_LOCAL_PARTS = ${if match_domain{$domain}{+virtual_domains}\ {${lookup{$local_part}lsearch*{${extract{directory}{VDOMAINDATA}{${value}/grey_users}}}{$local_part}{}}}{}}}\ {${lookup{$local_part}lsearch{/etc/exim4/grey_users}{$local_part}{}}}} : \ ${lookup{$local_part}lsearch{/var/lib/misc/$primary_hostname/mail-greylist}{$local_part}{}} +<%- if @is_rtmaster -%> RT_QUEUE_MAP = /srv/rt.debian.org/mail/rt_queue_map +<%- end -%> keep_environment = add_environment = @@ -317,7 +319,7 @@ acl_getprofile: accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} <%- end -%> -<%- if @is_bugsmaster or @is_bugsmx -%> +<%- if @is_bugsmx -%> warn domains = bugs.debian.org set acl_m_rprf = BugsMail @@ -597,10 +599,10 @@ check_recipient: # disabled accounts don't even get local mail. deny domains = +virtual_domains - local_parts = ${if exists {${extract{directory}{VDOMAINDATA}{${value}/mail-disable}}}\ - {lsearch;${extract{directory}{VDOMAINDATA}{${value}/mail-disable}}}\ + condition = ${if exists {${extract{directory}{VDOMAINDATA}{${value}/mail-disable}}}\ + {${lookup{${extract{1}{-}{$local_part}}}lsearch{${extract{directory}{VDOMAINDATA}{${value}/mail-disable}}}{true}{false}}}\ {}} - message = ${lookup{$local_part}lsearch{${extract{directory}{VDOMAINDATA}{${value}/mail-disable}}}{$value}} + message = ${lookup{${extract{1}{-}{$local_part}}}lsearch{${extract{directory}{VDOMAINDATA}{${value}/mail-disable}}}{$value}} deny local_parts = lsearch;/var/lib/misc/$primary_hostname/mail-disable domains = +local_domains @@ -623,12 +625,6 @@ check_recipient: deny domains = !+handled_domains local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ -# forwards mail to @d.o address, even if it's a bounce from master, no reply -# from source address; rejecting all mail now. - deny recipients = mendoza@debian.org - hosts = 65.110.39.147 : 64.39.31.15 - message = cannot forward here while mailer-daemon mail is not caught - deny condition = ${lookup{$sender_address_local_part}lsearch{/etc/exim4/localusers}{true}} sender_domains= +local_domains hosts = !+debianhosts @@ -782,7 +778,11 @@ check_recipient: 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\ +<%- else -%> + client_address=${sender_host_address}\n\ +<%- end -%> client_name=${sender_host_name}\n\ sender=${sender_address}\n\ recipient=$local_part@$domain\n\n @@ -917,7 +917,7 @@ check_message: <%- end -%> <%- if @is_packagesqamaster -%> - deny !hosts = +debianhosts : 5.153.231.21 + deny !hosts = +debianhosts condition = ${if eq {$acl_m_prf}{PTSMail}} condition = ${if def:h_X-PTS-Approved:{false}{true}} message = messages to the PTS require an X-PTS-Approved header @@ -1035,7 +1035,6 @@ begin rewrite *@debian.org ${lookup{$1}cdb{/var/lib/misc/${primary_hostname}/mail-forward.cdb}{$value}fail} T *@people.debian.org ${lookup{$1}cdb{/var/lib/misc/${primary_hostname}/mail-forward.cdb}{$value}fail} T #*@${primary_hostname} "${if exists{/etc/exim4/email-addresses}{${lookup{$1}lsearch{/etc/exim4/email-addresses}{$value}fail}}fail}" fFs -m68k@buildd.debian.org m68k-build@nocrew.org Ttrbc #!!#######################################################!!# @@ -1343,7 +1342,7 @@ rt_force_new_verbose: pipe_transport = rt_pipe data = "|/usr/bin/rt-mailgate --queue '${lookup{${sg{$local_part}{-comment}{}}}lsearch{RT_QUEUE_MAP}}' --url https://rt.debian.org/ --ca-file /etc/ssl/ca-debian/ca-certificates.crt --action ${if match{$local_part}{.*-comment.*}{comment}{correspond}}" headers_remove = Subject - headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}\nSubject: ${if and {{first_delivery}{match {$h_subject:}{(?i)(.*?)\\\\[?debian rt\\\\]?[:\\s]*(.*)}}} {$1$2}{$h_subject:}}" + headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}\nSubject: ${if and {{first_delivery}{match {$h_subject:}{(?is)(.*?)\\\\[?debian rt\\\\]?[:\\s]*(.*)}}} {$1$2}{$h_subject:}}" # FIXME: figure out how to generalize this approach so that all of the following would work # - rt+NNNN@rt.debian.org : attach correspondence to ticket (verbose) @@ -1360,7 +1359,7 @@ rt_force_new_quiesce: pipe_transport = rt_pipe data = "|/usr/bin/rt-mailgate --queue '${lookup{${sg{$local_part}{-comment}{}}}lsearch{RT_QUEUE_MAP}}' --url https://rt.debian.org/ --ca-file /etc/ssl/ca-debian/ca-certificates.crt --action ${if match{$local_part}{.*-comment.*}{comment}{correspond}}" headers_remove = Subject - headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}\nX-RT-Mode: quiesce\nSubject: ${if and {{first_delivery}{match {$h_subject:}{(?i)(.*?)\\\\[?debian rt\\\\]?[:\\s]*(.*)}}} {$1$2}{$h_subject:}}" + headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}\nX-RT-Mode: quiesce\nSubject: ${if and {{first_delivery}{match {$h_subject:}{(?is)(.*?)\\\\[?debian rt\\\\]?[:\\s]*(.*)}}} {$1$2}{$h_subject:}}" rt_otherwise: debug_print = "R: rt for $local_part@$domain" @@ -1464,11 +1463,8 @@ virt_users: <%= out = "" -if @is_bugsmaster or @is_bugsmx +if @is_bugsmx domain = 'bugs.debian.org' - if @is_bugsmaster - domain = 'bugs-master.debian.org' - end out = ' # This router delivers for bugs.d.o bugs: @@ -1618,7 +1614,7 @@ bsmtp: {$value}fail}\ }} -<%- if @is_bugsmaster or @is_bugsmx -%> +<%- if @is_bugsmx -%> bugs_pipe: driver = pipe command = /srv/bugs.debian.org/mail/run-procmail