X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Feximconf.erb;h=e941b7a007560950ee4f90e141ebc18ef46c8eab;hb=35ca374d9d1f7aefef8604df61e5579271487c2b;hp=1ea37fe5c9a504bd2b77128f91c45d24a02193b4;hpb=ed417d176455e33a6b49f7586f4b674c14173410;p=mirror%2Fdsa-puppet.git diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index 1ea37fe5c..e941b7a00 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -35,13 +35,20 @@ # us. This is primarily only usefull for emergancy 'queue # flushing' operations, but should be populated with a list # of trusted machines. Wildcards are not permitted +<%= +out = "" +if nodeinfo['mailrelay'] + out = ' # 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 # 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 # that list. - +' +end +out +%> # Exim's wildcard mechanism is a bit odd in that to say "any address in # debian.org including debian.org" you must use two patterns, # *.debian.org @@ -77,6 +84,16 @@ # MAIN CONFIGURATION SETTINGS # ###################################################################### +<%= +out='' +if nodeinfo.has_key?('heavy_exim') and not nodeinfo['heavy_exim'].empty? + out = " +perl_startup = do '/etc/exim4/exim_surbl.pl' +" +end +out +%> + # These options specify the Access Control Lists (ACLs) that # are used for incoming SMTP messages - after the RCPT and DATA # commands, respectively. @@ -84,6 +101,13 @@ acl_smtp_helo = check_helo acl_smtp_rcpt = ${if ={$interface_port}{587} {check_submission}{check_recipient}} acl_smtp_data = check_message +<%= +out='' +if nodeinfo.has_key?('heavy_exim') and not nodeinfo['heavy_exim'].empty? + out = "acl_smtp_mime = acl_check_mime" +end +out +%> # accept domain literal syntax in e-mail addresses. To actually make use of # this a router is also required @@ -114,7 +138,15 @@ localpartlist local_only_users = lsearch;/etc/exim4/localusers # accept mail for them. domainlist rcpthosts = partial-lsearch;/etc/exim4/rcpthosts hostlist debianhosts = 127.0.0.1 : net-lsearch;/var/lib/misc/thishost/debianhosts +<%= +out = "" +if nodeinfo['mailrelay'] + out = ' domainlist mailhubdomains = lsearch;/etc/exim4/manualroute +' +end +out +%> hostlist reservedaddrs = <%= nodeinfo['reservedaddrs'] %> @@ -371,10 +403,18 @@ out message = unknown user verify = recipient +<%= +out = "" +if nodeinfo['mailrelay'] + out = ' accept domains = +mailhubdomains endpass message = unknown user verify = recipient/callout=30s,defer_ok,use_sender,no_cache +' +end +out +%> accept domains = +submission_domains endpass @@ -386,7 +426,7 @@ out #!!# ACL that is used after the RCPT command check_recipient: -<%= +<%= out = "" if nodeinfo['mailrelay'] out = " accept verify = certificate" @@ -478,9 +518,17 @@ out hosts = !+debianhosts message = mail for $local_part is only accepted internally +<%= +out='' +if 0 == 1: +out=' deny message = address $sender_host_address is listed in $dnslist_domain; $dnslist_text hosts = !+debianhosts dnslists = rbl.debian.net : rbl.debian.net/$sender_address_domain +' +end +out +%> deny !recipients = survey@popcon.debian.org !verify = sender @@ -489,7 +537,6 @@ out condition = ${if >{${eval:$acl_c1}}{0}} ratelimit = 10 / 60m / per_rcpt / $sender_host_address message = slow down (no reverse dns, mismatched ehlo, dialup, or in blacklists) - <%= out = "" if has_variable?("policydweight") && policydweight == "true" @@ -554,23 +601,37 @@ out warn recipients = survey@popcon.debian.org set acl_m1 = PopconMail +<%= +out='' +if nodeinfo['rtmaster'] + out=' warn domains = rt.debian.org set acl_m1 = RTMail set acl_m12 = ${if def:acl_m12 {$acl_m12} {${if or{{match{$local_part}{[^+]+\\+\\d+}}{match{$local_part}{[^+]+\\+new}}} {RTMailRecipientHasSubaddress}}}} - +' +end +out +%> +<%= +out='' +if nodeinfo['packagesmaster'] + out=' warn domains = packages.qa.debian.org set acl_m1 = PTSMail warn recipients = owner@packages.qa.debian.org : postmaster@packages.qa.debian.org set acl_m1 = PTSOwner - warn recipients = change@db.debian.org : changes@db.debian.org : chpasswd@db.debian.org : ping@db.debian.org : recommend@nm.debian.org - set acl_m1 = DBSignedMail - warn senders = : domains = packages.qa.debian.org condition = ${if match{$local_part}{\N^bounces+\N}} set acl_m1 = PTSListBounce +' +end +out +%> + warn recipients = change@db.debian.org : changes@db.debian.org : chpasswd@db.debian.org : ping@db.debian.org : recommend@nm.debian.org + set acl_m1 = DBSignedMail <%= out = "" @@ -629,7 +690,7 @@ elsif has_variable?("postgrey") && postgrey == "true" ${readsocket{/var/run/postgrey/socket}{$acl_m3}\ {5s}{}{action=DUNNO}}\ }{action=}{}} - message = ${sg{$acl_m3}{^\\w+\\s*}{}} + message = ${sg{$acl_m3}{^\\\\w+\\\\s*}{}} log_message = greylisted. condition = ${if eq{${uc:${substr{0}{5}{$acl_m3}}}}{DEFER}} @@ -641,7 +702,7 @@ elsif has_variable?("postgrey") && postgrey == "true" domains = +handled_domains : +rcpthosts local_parts = GREYLIST_LOCAL_PARTS condition = ${if eq{${uc:${substr_0_7:$acl_m3}}}{PREPEND}} - message = ${sg{$acl_m3}{^\\w+\\s*}{}} + message = ${sg{$acl_m3}{^\\\\w+\\\\s*}{}} ' end out @@ -681,11 +742,18 @@ out !hosts = +debianhosts : WHITELIST !verify = sender/callout +<%= +out = "" +if nodeinfo['mailrelay'] + out = ' accept domains = +mailhubdomains endpass message = unknown user verify = recipient/callout=30s,defer_ok,use_sender,no_cache - +' +end +out +%> accept domains = +handled_domains endpass message = unknown user @@ -702,22 +770,54 @@ out deny message = relay not permitted +<%= +out='' +if nodeinfo.has_key?('heavy_exim') and not nodeinfo['heavy_exim'].empty? +out=' +acl_check_mime: + + deny condition = ${if <{$message_size}{256000}} + set acl_m5 = ${perl{surblspamcheck}} + condition = ${if eq{$acl_m5}{false}{no}{yes}} + log_message = $acl_m5 + message = $acl_m5 + + accept +' +end +out +%> + #!!# ACL that is used after the DATA command check_message: require verify = header_syntax message = Invalid syntax in the header +<%= +out='' +if nodeinfo['rtmaster'] + out=' deny condition = ${if eq {$acl_m1}{RTMail}} condition = ${if and{{!match {${lc:$rh_Subject:}} {debian rt}} \ - {!match {${lc:$rh_Subject:]}} {\\[rt.debian.org }} \ + {!match {${lc:$rh_Subject:]}} {\\\\[rt.debian.org }} \ {!match {$acl_m12}{RTMailRecipientHasSubaddress}}}} message = messages to the Request Tracker system require a subject tag or a subaddress - +' +end +out +%> +<%= +out='' +if nodeinfo['packagesmaster'] + out=' deny !hosts = +debianhosts : 217.196.43.134 condition = ${if eq {$acl_m1}{PTSMail}} condition = ${if def:h_X-PTS-Approved:{false}{true}} message = messages to the PTS require an X-PTS-Approved header - +' +end +out +%> deny condition = ${if match {$message_body}{\Nhttp:\/\/[a-z\.-]+\/video1?.exe\N}} message = Blackisted URI found in body @@ -766,6 +866,18 @@ out {${lookup{$local_part@$domain}nwildlsearch{/etc/exim4/sa_users}{$local_part}{}}}\ {${lookup{$local_part}lsearch{/etc/exim4/sa_users}{$local_part}{}}}}}} +<%= +out='' +if nodeinfo.has_key?('heavy_exim') and not nodeinfo['heavy_exim'].empty? +out=' + deny condition = ${if <{$message_size}{256000}} + set acl_m5 = ${perl{surblspamcheck}} + condition = ${if eq{$acl_m5}{false}{no}{yes}} + log_message = $acl_m5 +' +end +out +%> # Check header_sender except for survey@popcon.d.o deny condition = ${if eq{$acl_m1}{PopconMail}{false}{true}} !verify = header_sender @@ -1292,20 +1404,22 @@ end out %> -remote_smtp_smarthost: - debug_print = "T: remote_smtp_smarthost for $local_part@$domain" - driver = smtp <%= out = "" if not nodeinfo['smarthost'].empty? - out += " port = " + nodeinfo['smarthost_port'] + "\n" -end - -if has_variable?("exim_ssl_certs") && exim_ssl_certs == "true" - out += ' tls_tempfail_tryclear = false +out = ' +remote_smtp_smarthost: + debug_print = "T: remote_smtp_smarthost for $local_part@$domain" + driver = smtp + port = ' + out += nodeinfo['smarthost_port'].to_s + "\n" + if has_variable?("exim_ssl_certs") && exim_ssl_certs == "true" + out += ' tls_tempfail_tryclear = false + hosts_require_tls = ' + nodeinfo['smarthost'] + ' tls_certificate = /etc/exim4/ssl/thishost.crt tls_privatekey = /etc/exim4/ssl/thishost.key ' + end end out %>