X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Feximconf.erb;h=3cae25a344bcfcd80d8b2196bee585e63f06d324;hb=e97959a10c37d86418743654cb238dc1909a1a2a;hp=c8be351217f2f1dbf185757a1a1b09cae1830b79;hpb=404edcd3bddf15af30b55ff0d76eb2e2d9f5a970;p=mirror%2Fdsa-puppet.git diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index c8be35121..3cae25a34 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -8,27 +8,27 @@ # The configuration file uses a set of rules to generate an # acceptable mail environment for debian.org machines. It deviates -# considerably from what could be considered a standard exim configuration. +# considerably from what could be considered a standard Exim configuration. # This configuration file brings in the necessary information from -# other databases stored in /etc/exim/ and the files distributed by ud-ldap +# other databases stored in /etc/exim4/ and the files distributed by ud-ldap # This file is independent of the local host, it should not be changed # per machine. primary_hostname is used in all places that require per-host # settings. -# The configuration files in /etc/exim are as follows: +# The configuration files in /etc/exim4 are as follows: # locals - This is a list of domains that are considered local. A local -# domain is essential one that deliveries to /var/mail +# domain is essentially one for which deliveries to /var/mail # will be attempted. The users available for local delivery -# comes from /etc/passwd and /etc/aliases. Wildcards are not +# come from /etc/passwd and /etc/aliases. Wildcards are not # permitted. # virtualdomains - This is a list of all virtual domains. A virtual domain # is much like a local domain, execpt that the delivery location # and allowed set of users is controlled by a virtual domain # alias file and not /etc/passwd. Wildcards are permitted # relayhosts - Hostnames that can send any arbitarily addressed mail to -# us. This is primarily only usefull for emergancy 'queue +# us. This is primarily only useful for emergency 'queue # 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 @@ -37,7 +37,7 @@ # elsewhere. This is designed for use with small volume or # restricted machines that need to use a smarthost for mail # traffic. We will relay for them based on ssl cert validation -# but we need to teach exim how to route the mail to them. This is +# but we need to teach Exim how to route the mail to them. This is # that list. <%- end -%> @@ -50,9 +50,9 @@ # Further details can be found in each of the files. -# Usefull exim commands: +# Useful Exim commands: # exim4 -qf - Try sending all messages right now, including frozen ones -# exim4 -bt foo@blah - Write what exim would do if it saw the address +# exim4 -bt foo@blah - Write what Exim would do if it saw the address # Great for testing virtual domains and forward files # Special Features for users: @@ -68,7 +68,7 @@ # Heuristic check (none bad enough to cause a hard reject, but in aggregate # will trigger things like rcpt to rate limiting or possibly a reject if -# enough hits are triggered. +# enough hits are triggered). # # value is stored in acl_c_scr @@ -76,7 +76,7 @@ # MAIN CONFIGURATION SETTINGS # ###################################################################### -<%- if scope.lookupvar('deprecated::nodeinfo').has_key?('heavy_exim') and scope.lookupvar('deprecated::nodeinfo')['heavy_exim'] -%> +<%- if @heavy -%> perl_startup = do '/etc/exim4/exim_surbl.pl' <%- end -%> @@ -87,7 +87,7 @@ acl_smtp_helo = check_helo acl_smtp_rcpt = ${if ={$interface_port}{587} {check_submission}{check_recipient}} acl_smtp_data = check_message -<%- if scope.lookupvar('deprecated::nodeinfo').has_key?('heavy_exim') and scope.lookupvar('deprecated::nodeinfo')['heavy_exim'] -%> +<%- if @heavy -%> acl_smtp_mime = acl_check_mime <%- end -%> acl_smtp_predata = acl_check_predata @@ -159,14 +159,14 @@ 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 -# are set, exim uses "gecos_pattern" to parse the gecos field, and then +# are set, Exim uses "gecos_pattern" to parse the gecos field, and then # expands "gecos_name" as the user's name. $1 etc refer to sub-fields matched # by the pattern. gecos_pattern = ^([^,:]*) gecos_name = $1 -# This tells exim to immediately discard error messages (ie double bounces). +# This tells Exim to immediately discard error messages (ie double bounces). ignore_bounce_errors_after = 0s auto_thaw = 1d timeout_frozen_after=14d @@ -174,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('deprecated::nodeinfo').has_key?('heavy_exim') and scope.lookupvar('deprecated::nodeinfo')['heavy_exim'] -%> +<%- if @heavy -%> smtp_accept_max = 300 smtp_accept_queue = 200 smtp_accept_queue_per_connection = 50 @@ -193,7 +193,7 @@ check_spool_space = 20M delay_warning = -<%- if scope.lookupvar('deprecated::nodeinfo').has_key?('heavy_exim') and scope.lookupvar('deprecated::nodeinfo')['heavy_exim'] -%> +<%- if @heavy -%> message_body_visible = 5000 queue_run_max = 50 deliver_queue_load_max = 50 @@ -219,15 +219,14 @@ av_scanner = clamd:/var/run/clamav/clamd.ctl ports = [] out = "daemon_smtp_ports = " ports << 25 +if @mail_port # if we have an overridden mail_port + ports << @mail_port +end if @is_bugsmx ports << 587 end -if not scope.lookupvar('deprecated::nodeinfo')['mail_port'].to_s.empty? - ports << scope.lookupvar('deprecated::nodeinfo')['mail_port'] -end - if @is_mailrelay ports << @smarthost_port end @@ -255,6 +254,7 @@ received_header_text = Received: ${if def:sender_rcvhost {from $sender_rcvhost\n # macro definitions. # Do not wrap! +MAX_SCAN_SIZE = 256000 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}\ @@ -296,7 +296,7 @@ acl_getprofile: warn recipients = survey@popcon.debian.org set acl_m_rprf = PopconMail - accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} + accept condition = ${if !eq {$acl_m_rprf}{}} warn local_parts = +local_only_users domains = +local_domains @@ -310,92 +310,92 @@ acl_getprofile: set acl_m_rprf = localonly <%- end -%> - accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} + accept condition = ${if !eq {$acl_m_rprf}{}} <%- if @is_rtmaster -%> warn domains = rt.debian.org set acl_m_rprf = RTMail - accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} + accept condition = ${if !eq {$acl_m_rprf}{}} <%- end -%> <%- if @is_bugsmx -%> warn domains = bugs.debian.org set acl_m_rprf = BugsMail - accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} + accept condition = ${if !eq {$acl_m_rprf}{}} <%- end -%> <%- if @is_packagesmaster -%> warn domains = packages.debian.org set acl_m_rprf = PackagesMail - accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} + accept condition = ${if !eq {$acl_m_rprf}{}} <%- end -%> <%- if @is_packagesqamaster -%> warn recipients = owner@packages.qa.debian.org : postmaster@packages.qa.debian.org set acl_m_rprf = PTSOwner - accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} + accept condition = ${if !eq {$acl_m_rprf}{}} warn senders = : domains = packages.qa.debian.org condition = ${if match{$local_part}{\N^bounces+\N}} set acl_m_rprf = PTSListBounce - accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} + accept condition = ${if !eq {$acl_m_rprf}{}} warn domains = packages.qa.debian.org set acl_m_rprf = PTSMail - accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} + accept condition = ${if !eq {$acl_m_rprf}{}} <%- end -%> warn recipients = change@db.debian.org : changes@db.debian.org : chpasswd@db.debian.org : ping@db.debian.org : recommend@nm.debian.org set acl_m_rprf = DBSignedMail - accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} + accept condition = ${if !eq {$acl_m_rprf}{}} warn domains = +virtual_domains condition = ${if exists {${extract{directory}{VDOMAINDATA}{${value}/contentinspectionaction}}}} condition = ${if eq{${lookup{$local_part}lsearch*{${extract{directory}{VDOMAINDATA}{${value}/contentinspectionaction}}}{$value}{}}}{markup}} set acl_m_rprf = markup - accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} + accept condition = ${if !eq {$acl_m_rprf}{}} warn domains = +virtual_domains condition = ${if exists {${extract{directory}{VDOMAINDATA}{${value}/contentinspectionaction}}}} condition = ${if eq{${lookup{$local_part}lsearch*{${extract{directory}{VDOMAINDATA}{${value}/contentinspectionaction}}}{$value}{}}}{blackhole}} set acl_m_rprf = blackhole - accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} + accept condition = ${if !eq {$acl_m_rprf}{}} warn domains = +virtual_domains condition = ${if exists {${extract{directory}{VDOMAINDATA}{${value}/contentinspectionaction.cdb}}}} condition = ${if eq{${lookup{$local_part}cdb{${extract{directory}{VDOMAINDATA}{${value}/contentinspectionaction.cdb}}}{$value}{}}}{markup}} set acl_m_rprf = markup - accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} + accept condition = ${if !eq {$acl_m_rprf}{}} warn domains = +virtual_domains condition = ${if exists {${extract{directory}{VDOMAINDATA}{${value}/contentinspectionaction.cdb}}}} condition = ${if eq{${lookup{$local_part}cdb{${extract{directory}{VDOMAINDATA}{${value}/contentinspectionaction.cdb}}}{$value}{}}}{blackhole}} set acl_m_rprf = blackhole - accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} + accept condition = ${if !eq {$acl_m_rprf}{}} warn domains = +local_domains condition = ${if eq{${lookup{$local_part}cdb{/var/lib/misc/${primary_hostname}/mail-contentinspectionaction.cdb}{$value}{}}}{markup}} set acl_m_rprf = markup - accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} + accept condition = ${if !eq {$acl_m_rprf}{}} warn domains = +local_domains condition = ${if eq{${lookup{$local_part}cdb{/var/lib/misc/${primary_hostname}/mail-contentinspectionaction.cdb}{$value}{}}}{blackhole}} set acl_m_rprf = blackhole - accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} + accept condition = ${if !eq {$acl_m_rprf}{}} warn set acl_m_rprf = normal @@ -409,7 +409,7 @@ check_helo: accept verify = certificate <%- end -%> -<%- if scope.lookupvar('deprecated::nodeinfo')['smarthost'].empty? -%> +<%- unless @use_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. @@ -425,7 +425,7 @@ check_helo: log_message = Hit on list.dnswl.org for $sender_host_address set acl_c_scr = ${eval:$acl_c_scr-10} - warn condition = ${if isip {$sender_helo_name}{true}{false}} + warn condition = ${if isip {$sender_helo_name}} log_message = remote host used IP address in HELO/EHLO greeting set acl_c_scr = ${eval:$acl_c_scr+20} @@ -452,9 +452,9 @@ check_helo: # if rDNS does not match helo name (both lower cased first), greylist. warn !hosts = +debianhosts - condition = ${if eq {$host_lookup_failed}{1}{no}{yes}} - condition = ${if def:sender_helo_name {yes}{no}} - condition = ${if eq {${lc:$sender_helo_name}}{${lc:$sender_host_name}}{no}{yes}} + condition = ${if !eq {$host_lookup_failed}{1}} + condition = ${if def:sender_helo_name} + condition = ${if !eq {${lc:$sender_helo_name}}{${lc:$sender_host_name}}} log_message = HELO doesn't match rDNS set acl_c_scr = ${eval:$acl_c_scr+8} @@ -479,7 +479,7 @@ check_helo: # skip matching on machines named .*smtp.*, since that's 4 already. This is a fairly # naive test, so it's not worth much - warn condition = ${if match {${lc:$sender_helo_name}}{smtp}{no}{yes}} + warn condition = ${if !match {${lc:$sender_helo_name}}{smtp}} condition = ${if match {${lc:$sender_helo_name}}{\N^[a-z0-9]+\.[a-z]+$\N}} condition = ${if match {${lc:$sender_helo_name}}{\N.*[bcdfghjklmnpqrstvwxz]{7,}.*\.[a-z]+$\N}} log_message = random HELO @@ -506,11 +506,11 @@ check_submission: <%- end -%> # Defer after too many bad RCPT TO's. Legit MTAs will retry later. - # This is a rough pass at preventing addres harvesting or other mail blasts. + # This is a rough pass at preventing address harvesting or other mail blasts. defer log_message = Too many bad recipients ${eval:$rcpt_fail_count} out of $rcpt_count message = Too many bad recipients, try again later - condition = ${if > {${eval:$rcpt_fail_count}}{3}{yes}{no}} + condition = ${if > {${eval:$rcpt_fail_count}}{3}} defer ratelimit = 5 / 60m / per_rcpt / $sender_host_address @@ -546,7 +546,7 @@ check_recipient: condition = ${if eq{$acl_m_prf}{}} set acl_m_prf = $acl_m_rprf - defer condition = ${if eq{$acl_m_prf}{$acl_m_rprf}{no}{yes}} + defer condition = ${if !eq{$acl_m_prf}{$acl_m_rprf}} message = Different profile, please retry log_message = Only one profile at a time, please @@ -557,13 +557,13 @@ check_recipient: !acl = acl_spamlovers message = Too many bad recipients, try again later !hosts = +debianhosts - condition = ${if > {${eval:$rcpt_fail_count}}{3}{yes}{no}} + condition = ${if > {${eval:$rcpt_fail_count}}{3}} # Dump spambots that are so stupid they say helo as our IP address drop !hosts = +debianhosts !acl = acl_spamlovers - condition = ${if eq {$sender_helo_name}{$interface_address}{yes}{no}} + condition = ${if eq {$sender_helo_name}{$interface_address}} message = HELO mismatch Forged HELO for ($sender_helo_name) # Also for spambots that say helo as us or one of our domains @@ -585,16 +585,16 @@ check_recipient: defer !hosts = +debianhosts !acl = acl_spamlovers - condition = ${if eq{$acl_m_frg}{}{no}{yes}} - condition = ${if eq{$sender_host_name}{}{yes}{no}} - condition = ${if eq{$host_lookup_failed}{1}{no}{yes}} + condition = ${if !eq{$acl_m_frg}{}} + condition = ${if eq{$sender_host_name}{}} + condition = ${if !eq{$host_lookup_failed}{1}} message = Access temporarily denied. Resolve failed PTR for $sender_host_address # If DNS works, go ahead and reject them drop !hosts = +debianhosts !acl = acl_spamlovers - condition = ${if and { {!eq{$acl_m_frg}{}}{!match{$sender_host_name}{${rxquote:$acl_m_frg}\N$\N}}}{yes}{no}} + condition = ${if and { {!eq{$acl_m_frg}{}}{!match{$sender_host_name}{${rxquote:$acl_m_frg}\N$\N}}}} message = HELO mismatch Forged HELO for ($sender_helo_name) # disabled accounts don't even get local mail. @@ -636,8 +636,8 @@ check_recipient: 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}{VSENDERDOMAINDATA}{${value}/neversenders}}}{1}{0}} + deny condition = ${if match_domain{$sender_address_domain}{+virtual_domains}} + condition = ${if exists {${extract{directory}{VSENDERDOMAINDATA}{${value}/neversenders}}}} condition = ${lookup{$sender_address_local_part}lsearch{${extract{directory}{VSENDERDOMAINDATA}{${value}/neversenders}}}{true}} message = no mail should ever come from <$sender_address> @@ -650,26 +650,19 @@ check_recipient: message = X-Packages-FromTo-Same: yes <%- end -%> - deny condition = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}} + deny condition = ${if !eq {$acl_m_prf}{PopconMail}} !verify = sender defer !hosts = +debianhosts - condition = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}} + condition = ${if !eq {$acl_m_prf}{PopconMail}} condition = ${if >{${eval:$acl_c_scr+0}}{0}} 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 -%> - # 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 - # the socket when it's finished sending data, so it see each transaction as - # an incomplete read. I'm sure there's a way we could force exim to do - # something sick and clever to force either the interpretation or the socket - # closure, but I'm fairly sure it's now worth it, since the backport of - # policyd-weight is trivial. + # Check with policyd-weight warn !hosts = +debianhosts - condition = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}} + condition = ${if !eq {$acl_m_prf}{PopconMail}} set acl_m_pw = ${readsocket{inet:127.0.0.1:12525}\ {request=smtpd_access_policy\n\ protocol_state=RCPT\n\ @@ -687,39 +680,39 @@ check_recipient: # Defer on socket error defer !hosts = +debianhosts - condition = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}} - condition = ${if eq{$acl_m_pw}{socket failure}{yes}{no}} + condition = ${if !eq {$acl_m_prf}{PopconMail}} + condition = ${if eq{$acl_m_pw}{socket failure}} message = Cannot connect to policyd-weight. Please try again later. # Set proposed action to $acl_m_act and message to $acl_m_mes warn !hosts = +debianhosts - condition = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}} + condition = ${if !eq {$acl_m_prf}{PopconMail}} set acl_m_mes = ${extract{action}{$acl_m_pw}} set acl_m_act = ${sg{$acl_m_pw}{\Naction=[^ ]+ (.*)\n\n\N}{\$1}} # Add X-policyd-weight header line to message warn !hosts = +debianhosts - condition = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}} + condition = ${if !eq {$acl_m_prf}{PopconMail}} message = $acl_m_mes - condition = ${if eq{$acl_m_act}{PREPEND}{yes}{no}} + condition = ${if eq{$acl_m_act}{PREPEND}} # Write log message, if policyd-weight can't run checks warn !hosts = +debianhosts - condition = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}} + condition = ${if !eq {$acl_m_prf}{PopconMail}} log_message = policyd-weight message: $acl_m_mes - condition = ${if eq{$acl_m_act}{DUNNO}{yes}{no}} + condition = ${if eq{$acl_m_act}{DUNNO}} # Deny mails which policyd-weight thinks are spam deny !hosts = +debianhosts - condition = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}} + condition = ${if !eq {$acl_m_prf}{PopconMail}} message = policyd-weight said: $acl_m_mes - condition = ${if eq{$acl_m_act}{550}{yes}{no}} + condition = ${if eq{$acl_m_act}{550}} # Defer messages when policyd-weight suggests so. defer !hosts = +debianhosts - condition = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}} + condition = ${if !eq {$acl_m_prf}{PopconMail}} message = policyd-weight said: $acl_m_mes - condition = ${if eq{$acl_m_act}{450}{yes}{no}} + condition = ${if eq{$acl_m_act}{450}} <%- end -%> <%- if @is_rtmaster -%> @@ -745,7 +738,7 @@ check_recipient: {/etc/greylistd/whitelist-hosts}{}} : \ ${if exists {/var/lib/greylistd/whitelist-hosts}\ {/var/lib/greylistd/whitelist-hosts}{}} - condition = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}} + condition = ${if !eq {$acl_m_prf}{PopconMail}} !authenticated = * domains = +handled_domains condition = ${readsocket{/var/run/greylistd/socket}\ @@ -761,15 +754,15 @@ check_recipient: warn !senders = : !hosts = : +debianhosts : WHITELIST - condition = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}} - condition = ${if def:acl_m_grey {no}{yes}} + condition = ${if !eq {$acl_m_prf}{PopconMail}} + condition = ${if ! def:acl_m_grey} set acl_m_grey = $pid.$tod_epoch.$sender_host_port # and defers the message if postgrey thinks it should be defered ... defer !senders = : !hosts = : +debianhosts : WHITELIST - condition = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}} + condition = ${if !eq {$acl_m_prf}{PopconMail}} !authenticated = * domains = +handled_domains local_parts = GREYLIST_LOCAL_PARTS @@ -798,7 +791,7 @@ check_recipient: warn !senders = : !hosts = : +debianhosts : WHITELIST - condition = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}} + condition = ${if !eq {$acl_m_prf}{PopconMail}} !authenticated = * domains = +handled_domains local_parts = GREYLIST_LOCAL_PARTS @@ -817,7 +810,7 @@ check_recipient: accept local_parts = +postmasterish domains = +virtual_domains : +bsmtp_domains -<%- if scope.lookupvar('deprecated::nodeinfo')['smarthost'].empty? -%> +<%- unless @use_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}}}\ @@ -837,7 +830,7 @@ check_recipient: domains = +handled_domains !hosts = +debianhosts : WHITELIST -<%- if scope.lookupvar('deprecated::nodeinfo')['smarthost'].empty? -%> +<%- unless @use_smarthost -%> deny domains = +handled_domains local_parts = ${if match_domain{$domain}{+virtual_domains}\ {${if exists {${extract{directory}{VDOMAINDATA}{${value}/callout_users}}}\ @@ -865,30 +858,30 @@ check_recipient: deny message = relay not permitted -<%- if scope.lookupvar('deprecated::nodeinfo').has_key?('heavy_exim') and scope.lookupvar('deprecated::nodeinfo')['heavy_exim'] -%> +<%- if @heavy -%> acl_check_mime: accept verify = certificate accept hosts = +debianhosts - discard condition = ${if <{$message_size}{256000}} + discard condition = ${if <{$message_size}{MAX_SCAN_SIZE}} condition = ${if eq {$acl_m_prf}{blackhole}} set acl_m_srb = ${perl{surblspamcheck}} - condition = ${if eq{$acl_m_srb}{false}{no}{yes}} + condition = ${if !eq{$acl_m_srb}{false}} log_message = discarded surbl message for $recipients - deny condition = ${if <{$message_size}{256000}} - condition = ${if eq {$acl_m_prf}{markup}{no}{yes}} - condition = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}} + deny condition = ${if <{$message_size}{MAX_SCAN_SIZE}} + condition = ${if !eq {$acl_m_prf}{markup}} + condition = ${if !eq {$acl_m_prf}{PopconMail}} set acl_m_srb = ${perl{surblspamcheck}} - condition = ${if eq{$acl_m_srb}{false}{no}{yes}} + condition = ${if !eq{$acl_m_srb}{false}} log_message = $acl_m_srb message = $acl_m_srb - warn condition = ${if <{$message_size}{256000}} + warn condition = ${if <{$message_size}{MAX_SCAN_SIZE}} condition = ${if eq {$acl_m_prf}{markup}} set acl_m_srb = ${perl{surblspamcheck}} - condition = ${if eq{$acl_m_srb}{false}{no}{yes}} + condition = ${if !eq{$acl_m_srb}{false}} message = X-Surbl-Hit: $primary_hostname: $acl_m_srb accept @@ -904,7 +897,7 @@ acl_check_predata: #!!# ACL that is used after the DATA command check_message: - # Some people put from hostmaster@something.debian.org in the From + # Some people put from postmaster@something.debian.org in the From # header. Take their crack pipe away. drop condition = ${if match{${lc:$h_From:}}{\Npostmaster@([^.]+\.)?debian\.org\N}} @@ -919,7 +912,7 @@ check_message: <%- if @is_packagesqamaster -%> deny !hosts = +debianhosts condition = ${if eq {$acl_m_prf}{PTSMail}} - condition = ${if def:h_X-PTS-Approved:{false}{true}} + condition = ${if !def:h_X-PTS-Approved:} message = messages to the PTS require an X-PTS-Approved header <%- end -%> @@ -936,7 +929,7 @@ check_message: accept verify = certificate accept hosts = +debianhosts - deny condition = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}} + deny condition = ${if !eq {$acl_m_prf}{PopconMail}} !verify = header_syntax message = Invalid header syntax: $acl_verify_message @@ -947,13 +940,13 @@ check_message: condition = ${if or {{match {$rh_Subject:}{[\200-\377]}}\ {match {$rh_To:}{[\200-\377]}}\ {match {$rh_From:}{[\200-\377]}}\ - {match {$rh_Cc:}{[\200-\377]}}}{true}{false}} - condition = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}} + {match {$rh_Cc:}{[\200-\377]}}}} + condition = ${if !eq {$acl_m_prf}{PopconMail}} message = improper use of 8-bit data in message header: message rejected deny - condition = ${if match {$rh_Subject:}{[^[:print:]]\{8\}}{true}{false}} - condition = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}} + condition = ${if match {$rh_Subject:}{[^[:print:]]\{8\}}} + condition = ${if !eq {$acl_m_prf}{PopconMail}} message = Your mailer is not RFC 2047 compliant: message rejected <%- if has_variable?("clamd") && @clamd -%> @@ -964,8 +957,8 @@ check_message: 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}} + deny condition = ${if !eq {$acl_m_prf}{markup}} + condition = ${if !eq {$acl_m_prf}{PopconMail}} <%- if scope.call_function('versioncmp', [@lsbmajdistrelease, '8']) <= 0 -%> demime = * <%- end -%> @@ -980,30 +973,30 @@ check_message: message = X-malware detected: $malware_name <%- end -%> -<%- if scope.lookupvar('deprecated::nodeinfo').has_key?('heavy_exim') and scope.lookupvar('deprecated::nodeinfo')['heavy_exim'] -%> - discard condition = ${if <{$message_size}{256000}} +<%- if @heavy -%> + discard condition = ${if <{$message_size}{MAX_SCAN_SIZE}} condition = ${if eq {$acl_m_prf}{blackhole}} set acl_m_srb = ${perl{surblspamcheck}} - condition = ${if eq{$acl_m_srb}{false}{no}{yes}} + condition = ${if !eq{$acl_m_srb}{false}} log_message = discarded surbl message for $recipients - deny condition = ${if <{$message_size}{256000}} - condition = ${if eq {$acl_m_prf}{markup}{no}{yes}} - condition = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}} + deny condition = ${if <{$message_size}{MAX_SCAN_SIZE}} + condition = ${if !eq {$acl_m_prf}{markup}} + condition = ${if !eq {$acl_m_prf}{PopconMail}} set acl_m_srb = ${perl{surblspamcheck}} - condition = ${if eq{$acl_m_srb}{false}{no}{yes}} + condition = ${if !eq{$acl_m_srb}{false}} log_message = $acl_m_srb message = $acl_m_srb - warn condition = ${if <{$message_size}{256000}} + warn condition = ${if <{$message_size}{MAX_SCAN_SIZE}} condition = ${if eq {$acl_m_prf}{markup}} set acl_m_srb = ${perl{surblspamcheck}} - condition = ${if eq{$acl_m_srb}{false}{no}{yes}} + condition = ${if !eq{$acl_m_srb}{false}} message = X-Surbl-Hit: $primary_hostname: $acl_m_srb <%- end -%> # Check header_sender except for survey@popcon.d.o - deny condition = ${if eq{$acl_m_prf}{PopconMail}{false}{true}} + deny condition = ${if !eq{$acl_m_prf}{PopconMail}} !verify = header_sender message = No valid sender found in the From:, Sender: and Reply-to: headers @@ -1014,7 +1007,7 @@ check_message: !authenticated = * !verify = certificate !hosts = +debianhosts - condition = ${if <{$message_size}{256000}} + condition = ${if <{$message_size}{MAX_SCAN_SIZE}} spam = pkg_user : true condition = ${if >{$spam_score_int}{59}} @@ -1083,23 +1076,17 @@ ipliteral: transport = remote_smtp ignore_target_hosts = +reservedaddrs -<%= -out = "" -if not scope.lookupvar('deprecated::nodeinfo')['smarthost'].empty? -out = " +<%- if @use_smarthost -%> smarthost: - debug_print = \"R: smarthost for $local_part@$domain\" + debug_print = "R: smarthost for $local_part@$domain" driver = manualroute domains = !+handled_domains transport = remote_smtp_smarthost - route_list = * #{scope.lookupvar('deprecated::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. @@ -1148,9 +1135,9 @@ system_aliases: # current one gets passed on instead. This covers the case where A is # aliased to B and B has a .forward file pointing to A. -# For standard debian setup of one group per user, it is acceptable---normal +# For standard Debian setup of one group per user, it is acceptable---normal # even---for .forward to be group writable. If you have everyone in one -# group, you should comment out the "modemask" line. Without it, the exim +# group, you should comment out the "modemask" line. Without it, the Exim # default of 022 will apply, which is probably what you want. userforward_verify: @@ -1184,7 +1171,7 @@ userforward_verify: router_home_directory = ${lookup passwd{$local_part}{${extract{5}{:}{$value}}}fail} verify_only -# This is a senmailesque alias file lookup +# This is a sendmailesque alias file lookup virt_aliases: debug_print = "R: virt_aliases for $local_part@$domain" driver = redirect @@ -1375,8 +1362,8 @@ rt_otherwise: 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 -%> -# exim4 fails the router if it can't change to the user/group for delivery -# during verification. So we have to seperate the cases of verifying +# Exim fails the router if it can't change to the user/group for delivery +# during verification. So we have to separate the cases of verifying # the virts, and delivering to them. blah. virt_direct_verify: @@ -1461,17 +1448,13 @@ virt_users: local_part_suffix_optional retry_use_local_part -<%= -out = "" -if @is_bugsmx - domain = 'bugs.debian.org' - out = ' +<%- if @is_bugsmx -%> # This router delivers for bugs.d.o bugs: debug_print = "R: bugs for $local_part@$domain" driver = accept transport = bugs_pipe - domains = ' + domain + ' + domains = bugs.debian.org cannot_route_message = Unknown or archived bug require_files = /srv/bugs.debian.org/mail/run-procmail no_more @@ -1480,10 +1463,7 @@ bugs: {\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{/srv/bugs.debian.org/spool/db-h/$2/$1$2.summary}\ {$local_part}fail}}fail} -' -end -out -%> +<%- end -%> ###################################################################### # TRANSPORTS CONFIGURATION # ###################################################################### @@ -1494,7 +1474,7 @@ out begin transports -# This transport is used for local delivery to user mailboxes. On debian +# This transport is used for local delivery to user mailboxes. On Debian # systems group mail is used so we can write to the /var/mail # directory. (The alternative, which most other unixes use, is to deliver # as the user's own group, into a sticky-bitted directory) @@ -1577,14 +1557,14 @@ remote_smtp: tls_certificate = /etc/exim4/ssl/thishost.crt tls_privatekey = /etc/exim4/ssl/thishost.key -<%- if not scope.lookupvar('deprecated::nodeinfo')['smarthost'].empty? -%> +<%- if @use_smarthost -%> remote_smtp_smarthost: debug_print = "T: remote_smtp_smarthost for $local_part@$domain" driver = smtp delay_after_cutoff = false - port = <%= @marthost_port -%> + port = <%= @smarthost_port %> tls_tempfail_tryclear = false - hosts_require_tls = ' + scope.lookupvar('deprecated::nodeinfo')['smarthost'] + ' + hosts_require_tls = <%= @smarthost %> tls_certificate = /etc/exim4/ssl/thishost.crt tls_privatekey = /etc/exim4/ssl/thishost.key <%- end -%>