X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Feximconf.erb;h=7cd6738a2aa5368a1df01be03f2d6f04d6465b16;hb=368e147f10b8e748f7e171a15568a94d79599039;hp=bc847a1a364ba8739ef9c3652fdef129e1b007f4;hpb=c3bfc09c6cb084ff66be0a986bf3cf0ca6ccadbf;p=mirror%2Fdsa-puppet.git diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index bc847a1a3..7cd6738a2 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -32,7 +32,7 @@ # flushing' operations, but should be populated with a list # of trusted machines. Wildcards are not permitted # bsmtp_domains - Domains that we deliver locally via bsmtp -<%- if scope.lookupvar('site::nodeinfo')['mailrelay'] -%> +<%- if @is_mailrelay -%> # mailhubdomains - Domains for which we are the MX, but the mail is relayed # elsewhere. This is designed for use with small volume or # restricted machines that need to use a smarthost for mail @@ -76,8 +76,8 @@ # MAIN CONFIGURATION SETTINGS # ###################################################################### -<%- if scope.lookupvar('site::nodeinfo').has_key?('heavy_exim') and scope.lookupvar('site::nodeinfo')['heavy_exim'] -%> -perl_startup = do '/etc/exim4/exim_surbl.pl' +<%- if @heavy -%> + perl_startup = do '/etc/exim4/exim_surbl.pl' <%- end -%> # These options specify the Access Control Lists (ACLs) that @@ -87,7 +87,7 @@ perl_startup = do '/etc/exim4/exim_surbl.pl' acl_smtp_helo = check_helo acl_smtp_rcpt = ${if ={$interface_port}{587} {check_submission}{check_recipient}} acl_smtp_data = check_message -<%- if scope.lookupvar('site::nodeinfo').has_key?('heavy_exim') and scope.lookupvar('site::nodeinfo')['heavy_exim'] -%> +<%- if @heavy -%> acl_smtp_mime = acl_check_mime <%- end -%> acl_smtp_predata = acl_check_predata @@ -125,7 +125,7 @@ hostlist debianhosts = <; ; 127.0.0.1 ; ::1 ; /var/lib/misc/thishost/debianhosts hostlist reservedaddrs = 0.0.0.0/8 : 127.0.0.0/8 : 10.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/24 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5 -<%- if scope.lookupvar('site::nodeinfo')['mailrelay'] -%> +<%- if @is_mailrelay -%> # Domains we relay for; that is domains that aren't considered local but we # accept mail for them. domainlist mailhubdomains = lsearch;/etc/exim4/manualroute @@ -151,6 +151,11 @@ host_lookup = * untrusted_set_sender = * +# Some spam scanners (*cough* irritated *cough*) want the Sender field +# to exist. Appease them by not actually adding a Sender field. + +local_from_check = false + # Some operating systems use the "gecos" field in the system password file # to hold other information in addition to users' real names. Exim looks up # this field when it is creating "sender" and "from" headers. If these options @@ -169,7 +174,7 @@ timeout_frozen_after=14d message_size_limit = 100M message_logs = false smtp_accept_max_per_host = ${if match_ip {$sender_host_address}{+debianhosts}{0}{7}} -<%- if scope.lookupvar('site::nodeinfo').has_key?('heavy_exim') and scope.lookupvar('site::nodeinfo')['heavy_exim'] -%> +<%- if @heavy -%> smtp_accept_max = 300 smtp_accept_queue = 200 smtp_accept_queue_per_connection = 50 @@ -188,7 +193,7 @@ check_spool_space = 20M delay_warning = -<%- if scope.lookupvar('site::nodeinfo').has_key?('heavy_exim') and scope.lookupvar('site::nodeinfo')['heavy_exim'] -%> +<%- if @heavy -%> message_body_visible = 5000 queue_run_max = 50 deliver_queue_load_max = 50 @@ -206,7 +211,7 @@ queue_only_load = 8 <%- end -%> queue_list_requires_admin = false -<%- if has_variable?("clamd") && clamd == "true" -%> +<%- if has_variable?("clamd") && @clamd -%> av_scanner = clamd:/var/run/clamav/clamd.ctl <%- end -%> @@ -215,16 +220,16 @@ ports = [] out = "daemon_smtp_ports = " ports << 25 -if scope.lookupvar('site::nodeinfo')['bugsmaster'] or scope.lookupvar('site::nodeinfo')['bugsmx'] +if @is_bugsmx ports << 587 end -if not scope.lookupvar('site::nodeinfo')['mail_port'].to_s.empty? - ports << scope.lookupvar('site::nodeinfo')['mail_port'] +if not scope.lookupvar('deprecated::nodeinfo')['mail_port'].to_s.empty? + ports << scope.lookupvar('deprecated::nodeinfo')['mail_port'] end -if scope.lookupvar('site::nodeinfo')['mailrelay'] - ports << scope.lookupvar('site::nodeinfo')['smarthost_port'] +if @is_mailrelay + ports << @smarthost_port end out += ports.uniq.sort.join(" : ") @@ -238,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}}}}\ @@ -251,6 +256,7 @@ received_header_text = Received: ${if def:sender_rcvhost {from $sender_rcvhost\n # macro definitions. # Do not wrap! VDOMAINDATA = ${lookup{$domain}partial-lsearch{/etc/exim4/virtualdomains}{$value}} +VSENDERDOMAINDATA = ${lookup{$sender_address_domain}partial-lsearch{/etc/exim4/virtualdomains}{$value}} WHITELIST = ${if match_domain{$domain}{+virtual_domains}\ {${if exists {${extract{directory}{VDOMAINDATA}{${value}/whitelist}}}\ {${lookup{$local_part}lsearch{${extract{directory}{VDOMAINDATA}{${value}/whitelist}}}{$value}{}}}{}}}\ @@ -261,7 +267,12 @@ 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 = ###################################################################### # ACL CONFIGURATION # @@ -292,7 +303,7 @@ acl_getprofile: hosts = !+debianhosts set acl_m_rprf = localonly -<%- if scope.lookupvar('site::nodeinfo')['mailrelay'] -%> +<%- if @is_mailrelay -%> warn local_parts = +local_only_users domains = +mailhubdomains hosts = !+debianhosts @@ -301,28 +312,28 @@ acl_getprofile: <%- end -%> accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} -<%- if scope.lookupvar('site::nodeinfo')['rtmaster'] -%> +<%- if @is_rtmaster -%> warn domains = rt.debian.org set acl_m_rprf = RTMail accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} <%- end -%> -<%- if scope.lookupvar('site::nodeinfo')['bugsmaster'] or scope.lookupvar('site::nodeinfo')['bugsmx'] -%> +<%- if @is_bugsmx -%> warn domains = bugs.debian.org set acl_m_rprf = BugsMail accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} <%- end -%> -<%- if scope.lookupvar('site::nodeinfo')['packagesmaster'] -%> +<%- if @is_packagesmaster -%> warn domains = packages.debian.org set acl_m_rprf = PackagesMail accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} <%- end -%> -<%- if scope.lookupvar('site::nodeinfo')['packagesqamaster'] -%> +<%- if @is_packagesqamaster -%> warn recipients = owner@packages.qa.debian.org : postmaster@packages.qa.debian.org set acl_m_rprf = PTSOwner @@ -394,11 +405,11 @@ check_helo: warn set acl_c_scr = 0 -<%- if scope.lookupvar('site::nodeinfo')['mailrelay'] -%> +<%- if @is_mailrelay -%> accept verify = certificate <%- end -%> -<%- if scope.lookupvar('site::nodeinfo')['smarthost'].empty? -%> +<%- unless @smarthost -%> # These are in HELO acl so that they are only run once. They increment a counter, # so we don't want it to increment per rcpt to. @@ -490,7 +501,7 @@ check_submission: # We do this by testing for an empty sending host field. accept hosts = +debianhosts -<%- if scope.lookupvar('site::nodeinfo')['mailrelay'] -%> +<%- if @is_mailrelay -%> accept verify = certificate <%- end -%> @@ -511,7 +522,7 @@ check_submission: endpass verify = recipient -<%- if scope.lookupvar('site::nodeinfo')['mailrelay'] -%> +<%- if @is_mailrelay -%> accept domains = +mailhubdomains endpass verify = recipient/callout=30s,defer_ok,use_sender,no_cache @@ -526,7 +537,7 @@ check_submission: #!!# ACL that is used after the RCPT command check_recipient: -<%- if scope.lookupvar('site::nodeinfo')['mailrelay'] -%> +<%- if @is_mailrelay -%> accept verify = certificate <%- end -%> @@ -588,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 @@ -614,32 +625,26 @@ 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 message = mail from <$sender_address> not allowed externally deny sender_domains= +virtual_domains - condition = ${if exists {${extract{directory}{VDOMAINDATA}{${value}/localusers}}}} - condition = ${lookup{$sender_address_local_part}lsearch{${extract{directory}{VDOMAINDATA}{${value}/localusers}}}{true}} + condition = ${if exists {${extract{directory}{VSENDERDOMAINDATA}{${value}/localusers}}}} + condition = ${lookup{$sender_address_local_part}lsearch{${extract{directory}{VSENDERDOMAINDATA}{${value}/localusers}}}{true}} hosts = !+debianhosts message = mail from <$sender_address> not allowed externally deny condition = ${if match_domain{$sender_address_domain}{+virtual_domains}{1}{0}} - condition = ${if exists {${extract{directory}{VDOMAINDATA}{${value}/neversenders}}}{1}{0}} - condition = ${if match_local_part {$sender_address_local_part}{${extract{directory}{VDOMAINDATA}{${value}/neversenders}}}{1}{0}} + condition = ${if exists {${extract{directory}{VSENDERDOMAINDATA}{${value}/neversenders}}}{1}{0}} + condition = ${lookup{$sender_address_local_part}lsearch{${extract{directory}{VSENDERDOMAINDATA}{${value}/neversenders}}}{true}} message = no mail should ever come from <$sender_address> warn condition = ${if eq{$acl_m_prf}{localonly}} set acl_m_lrc = ${if eq{$acl_m_lrc}{}{$local_part@$domain}{$acl_m_lrc, $local_part@$domain}} -<%- if scope.lookupvar('site::nodeinfo')['packagesmaster'] -%> +<%- if @is_packagesmaster -%> warn condition = ${if eq {$acl_m_prf}{PackagesMail}} condition = ${if eq {$sender_address}{$local_part@$domain}} message = X-Packages-FromTo-Same: yes @@ -654,7 +659,7 @@ check_recipient: ratelimit = 10 / 60m / per_rcpt / $sender_host_address message = slow down (no reverse dns, mismatched ehlo, dialup, or in blacklists) -<%- if has_variable?("policydweight") && policydweight == "true" -%> +<%- if has_variable?("policydweight") && @policydweight -%> # Check with policyd-weight - this only works with a version after etch's, # sadly. etch's version attempts to hold the socket open, since that's what # postfix expects. Exim, on the other hand, expects the remote side to close @@ -717,7 +722,7 @@ check_recipient: condition = ${if eq{$acl_m_act}{450}{yes}{no}} <%- end -%> -<%- if scope.lookupvar('site::nodeinfo')['rtmaster'] -%> +<%- if @is_rtmaster -%> warn condition = ${if eq{$acl_m_prf}{RTMail}} set acl_m12 = ${if def:acl_m12 {$acl_m12} {${if or{{match{$local_part}{\N[^+]+\+\d+\N}}{match{$local_part}{\N[^+]+\+new\N}}{match{$local_part}{3520}}{match{$local_part}{3645}}} {RTMailRecipientHasSubaddress}}}} # temporary hack because weasel screwed up and gave people an rt-3520@ address, which doesn't really work normally. and rt-3645 @@ -725,7 +730,7 @@ check_recipient: <%- end -%> -<%- if has_variable?("greylistd") && greylistd == "true" -%> +<%- if has_variable?("greylistd") && @greylistd -%> defer message = $sender_host_address is not yet authorized to deliver mail from <$sender_address> to <$local_part@$domain>. log_message = greylisted. @@ -750,7 +755,7 @@ check_recipient: $local_part@$domain}\ {5s}{}{false}} -<%- elsif has_variable?("postgrey") && postgrey == "true" -%> +<%- elsif has_variable?("postgrey") && @postgrey -%> # next three are greylisting, inspired by http://www.bebt.de/blog/debian/archives/2006/07/30/T06_12_27/index.html # this adds acl_m_grey if there isn't one (so unique per message) warn @@ -773,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 @@ -797,9 +806,6 @@ check_recipient: message = ${sg{$acl_m_pgr}{^\\w+\\s*}{}} <%- end -%> - accept local_parts = +postmasterish - domains = +virtual_domains : +bsmtp_domains - deny hosts = ${if exists{/etc/exim4/host_blacklist}{/etc/exim4/host_blacklist}{}} message = I'm terribly sorry, but it seems you have been blacklisted log_message = blacklisted IP @@ -808,7 +814,10 @@ check_recipient: senders = ${if exists{/etc/exim4/blacklist}{/etc/exim4/blacklist}{}} message = We have blacklisted <$sender_address>. Please stop mailing us -<%- if scope.lookupvar('site::nodeinfo')['smarthost'].empty? -%> + accept local_parts = +postmasterish + domains = +virtual_domains : +bsmtp_domains + +<%- unless @smarthost -%> deny message = host $sender_host_address is listed in $dnslist_domain; see $dnslist_text dnslists = ${if match_domain{$domain}{+virtual_domains}\ {${if exists {${extract{directory}{VDOMAINDATA}{${value}/rbllist}}}\ @@ -828,7 +837,7 @@ check_recipient: domains = +handled_domains !hosts = +debianhosts : WHITELIST -<%- if scope.lookupvar('site::nodeinfo')['smarthost'].empty? -%> +<%- unless @smarthost -%> deny domains = +handled_domains local_parts = ${if match_domain{$domain}{+virtual_domains}\ {${if exists {${extract{directory}{VDOMAINDATA}{${value}/callout_users}}}\ @@ -840,7 +849,7 @@ check_recipient: message = "Sender verification failed: $acl_verify_message" <%- end -%> -<%- if scope.lookupvar('site::nodeinfo')['mailrelay'] -%> +<%- if @is_mailrelay -%> accept domains = +mailhubdomains endpass verify = recipient/callout=30s,defer_ok,use_sender,no_cache @@ -856,7 +865,7 @@ check_recipient: deny message = relay not permitted -<%- if scope.lookupvar('site::nodeinfo').has_key?('heavy_exim') and scope.lookupvar('site::nodeinfo')['heavy_exim'] -%> +<%- if @heavy -%> acl_check_mime: accept verify = certificate @@ -899,7 +908,7 @@ check_message: # header. Take their crack pipe away. drop condition = ${if match{${lc:$h_From:}}{\Npostmaster@([^.]+\.)?debian\.org\N}} -<%- if scope.lookupvar('site::nodeinfo')['rtmaster'] -%> +<%- if @is_rtmaster -%> deny condition = ${if eq {$acl_m_prf}{RTMail}} condition = ${if and{{!match {${lc:$rh_Subject:}} {debian rt}} \ {!match {${lc:$rh_Subject:]}} {\N\[rt.debian.org \N}} \ @@ -907,8 +916,8 @@ check_message: message = messages to the Request Tracker system require a subject tag or a subaddress <%- end -%> -<%- if scope.lookupvar('site::nodeinfo')['packagesqamaster'] -%> - deny !hosts = +debianhosts : 5.153.231.21 +<%- if @is_packagesqamaster -%> + 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 @@ -947,25 +956,31 @@ check_message: condition = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}} message = Your mailer is not RFC 2047 compliant: message rejected -<%- if has_variable?("clamd") && clamd == "true" -%> +<%- if has_variable?("clamd") && @clamd -%> discard condition = ${if eq {$acl_m_prf}{blackhole}} + <%- if scope.call_function('versioncmp', [@lsbmajdistrelease, '8']) <= 0 -%> demime = * + <%- end -%> malware = */defer_ok log_message = discarded malware message for $recipients deny condition = ${if eq {$acl_m_prf}{markup}{no}{yes}} condition = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}} + <%- if scope.call_function('versioncmp', [@lsbmajdistrelease, '8']) <= 0 -%> demime = * + <%- end -%> malware = */defer_ok message = malware detected: $malware_name: message rejected warn condition = ${if eq {$acl_m_prf}{markup}} + <%- if scope.call_function('versioncmp', [@lsbmajdistrelease, '8']) <= 0 -%> demime = * + <%- end -%> malware = */defer_ok message = X-malware detected: $malware_name <%- end -%> -<%- if scope.lookupvar('site::nodeinfo').has_key?('heavy_exim') and scope.lookupvar('site::nodeinfo')['heavy_exim'] -%> +<%- if @heavy -%> discard condition = ${if <{$message_size}{256000}} condition = ${if eq {$acl_m_prf}{blackhole}} set acl_m_srb = ${perl{surblspamcheck}} @@ -992,7 +1007,7 @@ check_message: !verify = header_sender message = No valid sender found in the From:, Sender: and Reply-to: headers -<%- if scope.lookupvar('site::nodeinfo')['packagesmaster'] -%> +<%- if @is_packagesmaster -%> deny message = Congratulations, you scored $spam_score points. log_message = spam: $spam_score points. condition = ${if eq {$acl_m_prf}{PackagesMail}} @@ -1016,11 +1031,10 @@ check_message: begin rewrite -\N^buildd_(.*)@franck\.debian\.org$\N buildd_$1@buildd.debian.org T +\N^buildd_(.*)@fasolo\.debian\.org$\N buildd_$1@buildd.debian.org T *@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 #!!#######################################################!!# @@ -1040,7 +1054,7 @@ begin routers # An address is passed to each in turn until it is accepted. # ###################################################################### -<%- if scope.lookupvar('site::nodeinfo')['mailrelay'] -%> +<%- if @is_mailrelay -%> relay_manualroute: driver = manualroute domains = +mailhubdomains @@ -1069,23 +1083,17 @@ ipliteral: transport = remote_smtp ignore_target_hosts = +reservedaddrs -<%= -out = "" -if not scope.lookupvar('site::nodeinfo')['smarthost'].empty? -out = " +<%- if @smarthost -%> smarthost: debug_print = \"R: smarthost for $local_part@$domain\" driver = manualroute domains = !+handled_domains transport = remote_smtp_smarthost - route_list = * #{scope.lookupvar('site::nodeinfo')['smarthost']} + route_list = * <%= @smarthost %> host_find_failed = defer same_domain_copy_routing = yes no_more -" -end -out -%> +<%- end -%> # This router routes to remote hosts over SMTP using a DNS lookup. # Ignore reserved network responses, including localhost. @@ -1298,7 +1306,7 @@ localuser: # Everything before here should apply only to the local domains with a # domains= rule -<%- if scope.lookupvar('site::nodeinfo')['packagesmaster'] -%> +<%- if @is_packagesmaster -%> # This router delivers for packages.d.o packages: debug_print = "R: packages for $local_part@$domain" @@ -1316,7 +1324,7 @@ packages: no_more <%- end -%> -<%- if scope.lookupvar('site::nodeinfo')['rtmaster'] -%> +<%- if @is_rtmaster -%> # This router delivers for rt.d.o rt_force_new_verbose: debug_print = "R: rt for $local_part+new@$domain" @@ -1326,9 +1334,9 @@ rt_force_new_verbose: local_parts = ${lookup{${sg{$local_part}{-comment}{}}}lsearch{RT_QUEUE_MAP}{$local_part}{}} local_part_suffix = +new pipe_transport = rt_pipe - data = "|/usr/bin/rt-mailgate --queue '${lookup{${sg{$local_part}{-comment}{}}}lsearch{RT_QUEUE_MAP}}' --url https://rt.debian.org/ --action ${if match{$local_part}{.*-comment.*}{comment}{correspond}}" + 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) @@ -1343,9 +1351,9 @@ rt_force_new_quiesce: local_parts = ${lookup{${sg{$local_part}{-comment}{}}}lsearch{RT_QUEUE_MAP}{$local_part}{}} local_part_suffix = +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/ --action ${if match{$local_part}{.*-comment.*}{comment}{correspond}}" + 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" @@ -1356,7 +1364,7 @@ rt_otherwise: local_part_suffix = +* local_part_suffix_optional pipe_transport = rt_pipe - data = "|/usr/bin/rt-mailgate --queue '${lookup{${sg{$local_part}{-(comment|done)}{}}}lsearch{RT_QUEUE_MAP}}' --url https://rt.debian.org/ --extension ticket --action ${if match{$local_part}{.*-comment.*}{comment}{${if match{$local_part}{.*-done.*}{correspond-resolve}{correspond}}}}" + data = "|/usr/bin/rt-mailgate --queue '${lookup{${sg{$local_part}{-(comment|done)}{}}}lsearch{RT_QUEUE_MAP}}' --url https://rt.debian.org/ --ca-file /etc/ssl/ca-debian/ca-certificates.crt --extension ticket --action ${if match{$local_part}{.*-comment.*}{comment}{${if match{$local_part}{.*-done.*}{correspond-resolve}{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:}}" <%- end -%> @@ -1449,11 +1457,8 @@ virt_users: <%= out = "" -if scope.lookupvar('site::nodeinfo')['bugsmaster'] or scope.lookupvar('site::nodeinfo')['bugsmx'] +if @is_bugsmx domain = 'bugs.debian.org' - if scope.lookupvar('site::nodeinfo')['bugsmaster'] - domain = 'bugs-master.debian.org' - end out = ' # This router delivers for bugs.d.o bugs: @@ -1462,12 +1467,12 @@ bugs: transport = bugs_pipe domains = ' + domain + ' cannot_route_message = Unknown or archived bug - require_files = /org/bugs.debian.org/mail/run-procmail + require_files = /srv/bugs.debian.org/mail/run-procmail no_more local_parts = ${if match\ {$local_part}\ {\N^(\d+)(\d{2})(?:-(?:(?:submit|maintonly|quiet|forwarded|done|close|request|submitter)|(?:unsubscribe|ignore|help|(?:sub(?:scribe|help|yes|approve|reject))|unsubyes|bounce|probe|approve|reject|setlistyes|setlistsilentyes).*))?$\N}\ - {${if exists{/org/bugs.debian.org/spool/db-h/$2/$1$2.summary}\ + {${if exists{/srv/bugs.debian.org/spool/db-h/$2/$1$2.summary}\ {$local_part}fail}}fail} ' end @@ -1566,24 +1571,17 @@ remote_smtp: tls_certificate = /etc/exim4/ssl/thishost.crt tls_privatekey = /etc/exim4/ssl/thishost.key -<%= -out = "" -if not scope.lookupvar('site::nodeinfo')['smarthost'].empty? -out = ' +<%- if @smarthost -%> remote_smtp_smarthost: debug_print = "T: remote_smtp_smarthost for $local_part@$domain" driver = smtp delay_after_cutoff = false - port = ' - out += scope.lookupvar('site::nodeinfo')['smarthost_port'].to_s + "\n" - out += ' tls_tempfail_tryclear = false - hosts_require_tls = ' + scope.lookupvar('site::nodeinfo')['smarthost'] + ' + port = <%= @smarthost_port %> + tls_tempfail_tryclear = false + hosts_require_tls = <%= scope.lookupvar('deprecated::nodeinfo')['smarthost'] %> tls_certificate = /etc/exim4/ssl/thishost.crt tls_privatekey = /etc/exim4/ssl/thishost.key -' -end -out -%> +<%- end -%> # Send the message to procmail procmail_pipe: driver = pipe @@ -1603,10 +1601,10 @@ bsmtp: {$value}fail}\ }} -<%- if scope.lookupvar('site::nodeinfo')['bugsmaster'] or scope.lookupvar('site::nodeinfo')['bugsmx'] -%> +<%- if @is_bugsmx -%> bugs_pipe: driver = pipe - command = /org/bugs.debian.org/mail/run-procmail + command = /srv/bugs.debian.org/mail/run-procmail environment = "EXTENSION=${substr_1:${local_part_suffix}}:\ EXT=${substr_1:${local_part_suffix}}:\ LOCAL=${local_part}${local_part_suffix}:\ @@ -1616,7 +1614,7 @@ bugs_pipe: user = debbugs <%- end -%> -<%- if scope.lookupvar('site::nodeinfo')['rtmaster'] -%> +<%- if @is_rtmaster -%> rt_pipe: debug_print = "T: rt_pipe for $local_part${local_part_suffix}@$domain" driver = pipe