X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Feximconf.erb;h=fd4b2afbc6c98117f93df654dba4ff2ae31f9ec3;hb=0d6af8154c6becdf3929de5502af8fee8afec0aa;hp=4676daddcc86f2098261b792317e02652521158d;hpb=8216df9cabaab0f8341f3c73bb5db40f0d433cc2;p=dsa-puppet.git diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index 4676dadd..fd4b2afb 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -115,13 +115,15 @@ domainlist bsmtp_domains = ${if exists {/etc/exim4/bsmtp}{partial-lsearch;/etc/e domainlist handled_domains = +local_domains : +virtual_domains : +bsmtp_domains +domainlist ourself_and_handled = $primary_hostname : +handled_domains + localpartlist local_only_users = lsearch;/etc/exim4/localusers localpartlist postmasterish = postmaster : abuse : hostmaster hostlist debianhosts = <; ; 127.0.0.1 ; ::1 ; /var/lib/misc/thishost/debianhosts ; 89.16.166.49 ; 82.195.75.76 ; 2001:41b8:202:deb:bab5:0:52c3:4b4c -hostlist reservedaddrs = <%= scope.lookupvar('site::nodeinfo')['reservedaddrs'] %> +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'] -%> # Domains we relay for; that is domains that aren't considered local but we @@ -129,14 +131,12 @@ hostlist reservedaddrs = <%= scope.lookupvar('site::nodeinfo')['reservedaddrs'] domainlist mailhubdomains = lsearch;/etc/exim4/manualroute <%- end -%> -<%- if has_variable?("exim_ssl_certs") && exim_ssl_certs == "true" -%> 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 -<%- end -%> # The setting below causes Exim to do a reverse DNS lookup on all incoming # IP calls, in order to get the true host name. If you feel this is too # expensive, you can specify the networks for which a lookup is done, or @@ -196,8 +196,13 @@ queue_only_load = 35 smtp_load_reserve = 20 <%- else -%> queue_run_max = 5 +<%- if scope.lookupvar('::processorcount').to_s != 'undefined' -%> +deliver_queue_load_max = <%= [scope.lookupvar('::processorcount').to_i,2].max * 5 %> +queue_only_load = <%= [scope.lookupvar('::processorcount').to_i,2].max * 4 %> +<%- else -%> deliver_queue_load_max = 10 -queue_only_load = 5 +queue_only_load = 8 +<%- end -%> <%- end -%> queue_list_requires_admin = false @@ -230,9 +235,7 @@ admin_groups = adm remote_sort_domains = *.debian.org:*.debian.net pipelining_advertise_hosts = !* -<%- if has_variable?("exim_ssl_certs") && exim_ssl_certs == "true" -%> tls_advertise_hosts = * -<%- end -%> smtp_enforce_sync = true log_selector = +tls_cipher +tls_peerdn +queue_time +deliver_time +smtp_connection +smtp_incomplete_transaction +smtp_confirmation @@ -556,7 +559,7 @@ check_recipient: drop !hosts = +debianhosts !acl = acl_spamlovers - condition = ${if match_domain{$sender_helo_name}{$primary_hostname:+handled_domains}} + condition = ${if match_domain{$sender_helo_name}{+ourself_and_handled}} condition = ${if !match{$sender_host_name}{${rxquote:$sender_helo_name}\N$\N}} message = HELO mismatch Forged HELO for ($sender_helo_name) @@ -795,7 +798,7 @@ check_recipient: <%- end -%> accept local_parts = +postmasterish - domains = +handled_domains + 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 @@ -834,6 +837,7 @@ check_recipient: ${lookup{$local_part}lsearch{/var/lib/misc/$primary_hostname/mail-callout}{$local_part}{}} !hosts = +debianhosts : WHITELIST !verify = sender/callout=90s,maxwait=300s + message = "Sender verification failed: $acl_verify_message" <%- end -%> <%- if scope.lookupvar('site::nodeinfo')['mailrelay'] -%> @@ -1068,21 +1072,17 @@ ipliteral: <%= out = "" if not scope.lookupvar('site::nodeinfo')['smarthost'].empty? -out = ' +out = " 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('site::nodeinfo')['smarthost'] - if scope.lookupvar('site::nodeinfo')['smarthost'] == 'mailout.debian.org' - out += '/MX' - end - out += ' + route_list = * #{scope.lookupvar('site::nodeinfo')['smarthost']} host_find_failed = defer same_domain_copy_routing = yes no_more -' +" end out %> @@ -1104,7 +1104,7 @@ postmasterish: unseen = true expn = true local_parts = +postmasterish - domains = +handled_domains + domains = +virtual_domains : +bsmtp_domains data = debian-admin@debian.org headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}" @@ -1318,11 +1318,11 @@ packages: file_transport = address_file pipe_transport = address_pipe domains = packages.debian.org - require_files = /org/packages.debian.org/conf/maintainer - data = ${lookup{$local_part}cdb{/org/packages.debian.org/conf/maintainer.cdb}} + require_files = /srv/packages.debian.org/conf/maintainer + data = ${lookup{$local_part}cdb{/srv/packages.debian.org/conf/maintainer.cdb}} headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}" - transport_home_directory = /org/packages.debian.org/mail - transport_current_directory = /org/packages.debian.org/mail + transport_home_directory = /srv/packages.debian.org/mail + transport_current_directory = /srv/packages.debian.org/mail check_ancestor retry_use_local_part no_more @@ -1364,14 +1364,13 @@ rt_otherwise: driver = redirect domains = rt.debian.org require_files = /usr/bin/rt-mailgate : RT_QUEUE_MAP - local_parts = ${lookup{${sg{$local_part}{-comment}{}}}lsearch{RT_QUEUE_MAP}{$local_part}{}} + local_parts = ${lookup{${sg{$local_part}{-(comment|done)}{}}}lsearch{RT_QUEUE_MAP}{$local_part}{}} local_part_suffix = +* local_part_suffix_optional pipe_transport = rt_pipe - data = "|/usr/bin/rt-mailgate --queue '${lookup{${sg{$local_part}{-comment}{}}}lsearch{RT_QUEUE_MAP}}' --url https://rt.debian.org/ --extension ticket --action ${if match{$local_part}{.*-comment.*}{comment}{correspond}}" + 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}}}}" 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 -%> # exim4 fails the router if it can't change to the user/group for delivery @@ -1566,10 +1565,8 @@ remote_smtp: driver = smtp connect_timeout = 1m delay_after_cutoff = false -<%- if has_variable?("exim_ssl_certs") && exim_ssl_certs == "true" -%> tls_certificate = /etc/exim4/ssl/thishost.crt tls_privatekey = /etc/exim4/ssl/thishost.key -<%- end -%> <%= out = "" @@ -1581,13 +1578,11 @@ remote_smtp_smarthost: delay_after_cutoff = false port = ' out += scope.lookupvar('site::nodeinfo')['smarthost_port'].to_s + "\n" - if has_variable?("exim_ssl_certs") && exim_ssl_certs == "true" - out += ' tls_tempfail_tryclear = false + out += ' tls_tempfail_tryclear = false hosts_require_tls = ' + scope.lookupvar('site::nodeinfo')['smarthost'] + ' tls_certificate = /etc/exim4/ssl/thishost.crt tls_privatekey = /etc/exim4/ssl/thishost.key ' - end end out %>