X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ffiles%2Fcommon%2Fexim4.conf;h=93802745adeb21a5f40868fc185e1830352411b3;hb=5a40c34e0e576183b800c6981826a6c3a444c13b;hp=85201374bc4ca676393b471d94907facafa3a5be;hpb=be70abdd6ebea0169f6e65d766554a4e2379a484;p=mirror%2Fdsa-puppet.git diff --git a/modules/exim/files/common/exim4.conf b/modules/exim/files/common/exim4.conf index 85201374b..93802745a 100644 --- a/modules/exim/files/common/exim4.conf +++ b/modules/exim/files/common/exim4.conf @@ -39,6 +39,12 @@ # 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 +# 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. # The division of files is designed so that all hosts may share rcpthosts # and relayhosts, these could be replicated automatically if necessary. @@ -115,6 +121,7 @@ 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 +domainlist mailhubdomains = lsearch;/etc/exim4/manualroute .ifndef RESERVEDADDRS RESERVEDADDRS = 0.0.0.0/8 : 127.0.0.0/8 : 10.0.0.0/8 : 169.254.0.0/16 : \ @@ -124,6 +131,14 @@ RESERVEDADDRS = 0.0.0.0/8 : 127.0.0.0/8 : 10.0.0.0/8 : 169.254.0.0/16 : \ hostlist reservedaddrs = RESERVEDADDRS +.ifdef USE_TLS +tls_certificate = /etc/exim4/ssl/thishost.crt +tls_privatekey = /etc/exim4/ssl/thishost.key +tls_try_verify_hosts = * +tls_verify_certificates = /etc/exim4/ssl/ca.crt +tls_crl = /etc/exim4/ssl/ca.crl +.endif + #system_filter = /etc/exim4/filter #system_filter_file_transport = address_file @@ -182,7 +197,7 @@ queue_list_requires_admin = false av_scanner = CLAMAV .endif -.ifdef HAVE_USER_DEBBUGS +.ifdef HAVE_USER_DEBBUGS MAIL_RELAY STUPID_FIREWALL daemon_smtp_ports = 25 : 587 .endif @@ -190,6 +205,9 @@ admin_groups = adm remote_sort_domains = *.debian.org:*.debian.net pipelining_advertise_hosts = !* +.ifdef USE_TLS +tls_advertise_hosts = * +.endif smtp_enforce_sync = true log_selector = +tls_cipher +tls_peerdn +queue_time +deliver_time +smtp_connection +smtp_incomplete_transaction +smtp_confirmation @@ -301,6 +319,10 @@ check_submission: # 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. +.ifdef MAIL_RELAY + accept verify = certificate +.endif + 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}} @@ -319,6 +341,10 @@ check_submission: #!!# ACL that is used after the RCPT command check_recipient: +.ifdef MAIL_RELAY + accept verify = certificate +.endif + # 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. @@ -413,7 +439,7 @@ check_recipient: defer !hosts = +debianhosts condition = ${if >{${eval:$acl_c1}}{0}} ratelimit = 10 / 60m / per_rcpt / $sender_host_address - message = slow down (no reverse dns, or dialup) + message = slow down (no reverse dns, mismatched ehlo, dialup, or in blacklists) .ifdef HAVE_POLICYD # Check with policyd-weight - this only works with a version after etch's, @@ -596,6 +622,11 @@ check_recipient: !hosts = +debianhosts : WHITELIST !verify = sender/callout + accept domains = +mailhubdomains + endpass + message = unknown user + verify = recipient/callout,defer_ok + accept domains = +handled_domains endpass message = unknown user @@ -632,10 +663,12 @@ check_message: message = Blackisted URI found in body deny condition = ${if eq {$acl_m1}{DBSignedMail}} - condition = ${if and {{!match {$message_body}{PGP MESSAGE}} \ - {!match {$message_body}{PGP SIGNED MESSAGE}} \ - {!match {$message_body}{PGP SIGNATURE}} \ - } \ + condition = ${if and {{!match {$message_body}{PGP MESSAGE}} \ + {!match {$message_body}{PGP SIGNED MESSAGE}} \ + {!match {$message_body}{PGP SIGNATURE}} \ + {!match {$header_content-type:}{multipart/signed}} \ + {!match {$header_content-type:}{pgp}} \ + } \ } message = Mail to this address needs to be PGP-signed @@ -710,6 +743,13 @@ begin routers # An address is passed to each in turn until it is accepted. # ###################################################################### +relay_manualroute: + driver = manualroute + domains = +mailhubdomains + transport = remote_smtp + route_data = ${lookup{$domain}lsearch{/etc/exim4/manualroute}} + require_files = /etc/exim4/manualroute + bsmtp: debug_print = "R: bsmtp for $local_part@$domain" driver = manualroute @@ -1115,7 +1155,13 @@ address_reply: remote_smtp: driver = smtp connect_timeout = 1m - hosts_avoid_tls = * +.ifdef USE_TLS +# tls_tempfail_tryclear = true + tls_certificate = /etc/exim4/ssl/thishost.crt + tls_privatekey = /etc/exim4/ssl/thishost.key +# tls_verify_certificates = /etc/exim4/ssl/ca.crt +# tls_crl = /etc/exim4/ssl/ca.crl +.endif # Send the message to procmail procmail_pipe: