X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Feximconf.erb;h=aec6edbe9242992db3302793a700b327b8c560b8;hb=0350939d4f33195041773775e73c635865b6c609;hp=366a5cebde515be4665f47c3e1e6513b4f5e03ac;hpb=b699a779f1408ee58a7339dc43c454ffa8ea3ae8;p=dsa-puppet.git diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index 366a5ceb..aec6edbe 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 @@ -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 @@ -215,7 +215,7 @@ ports = [] out = "daemon_smtp_ports = " ports << 25 -if scope.lookupvar('site::nodeinfo')['bugsmaster'] or scope.lookupvar('site::nodeinfo')['bugsmx'] +if @is_bugsmaster or @is_bugsmx ports << 587 end @@ -223,7 +223,7 @@ if not scope.lookupvar('site::nodeinfo')['mail_port'].to_s.empty? ports << scope.lookupvar('site::nodeinfo')['mail_port'] end -if scope.lookupvar('site::nodeinfo')['mailrelay'] +if @is_mailrelay ports << scope.lookupvar('site::nodeinfo')['smarthost_port'] end @@ -251,6 +251,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}{}}}{}}}\ @@ -292,7 +293,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 +302,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_bugsmaster or @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,7 +395,7 @@ check_helo: warn set acl_c_scr = 0 -<%- if scope.lookupvar('site::nodeinfo')['mailrelay'] -%> +<%- if @is_mailrelay -%> accept verify = certificate <%- end -%> @@ -490,7 +491,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 +512,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 +527,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 -%> @@ -626,20 +627,20 @@ check_recipient: 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 @@ -717,7 +718,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 @@ -798,7 +799,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 @@ -840,7 +841,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 @@ -899,7 +900,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 +908,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 : 217.196.43.134 +<%- if @is_packagesqamaster -%> + deny !hosts = +debianhosts : 5.153.231.21 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 @@ -929,7 +930,7 @@ check_message: deny condition = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}} !verify = header_syntax - message = Invalid syntax in the header + message = Invalid header syntax: $acl_verify_message # RFC 822 and 2822 say that headers must be ASCII. This kinda emulates # postfix's strict_7bit_headers option, but only checks a few common problem @@ -992,7 +993,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}} @@ -1040,7 +1041,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 @@ -1104,7 +1105,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}" @@ -1146,11 +1147,7 @@ userforward_verify: user = Debian-exim no_check_local_user directory_transport = address_directory -<%- if fqdn == "master.debian.org" -%> - domains = +local_domains : debian.org -<%- else -%> domains = +local_domains -<%- end -%> # filter - I have disabled filtering to force users to use .forward-foo files # or procmail. This will make it easier to move mailers in the future # @@ -1229,11 +1226,7 @@ userforward: check_ancestor check_local_user directory_transport = address_directory -<%- if fqdn == "master.debian.org" -%> - domains = +local_domains : debian.org -<%- else -%> domains = +local_domains -<%- end -%> # filter - I have disabled filtering to force users to use .forward-foo files # or procmail. This will make it easier to move mailers in the future # @@ -1261,11 +1254,7 @@ procmail: debug_print = "R: procmail for $local_part@$domain" driver = accept check_local_user -<%- if fqdn == "master.debian.org" -%> - domains = +local_domains : debian.org -<%- else -%> domains = +local_domains -<%- end -%> headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}" local_part_suffix = -* local_part_suffix_optional @@ -1310,7 +1299,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" @@ -1328,7 +1317,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" @@ -1438,9 +1427,19 @@ virt_users: transport_current_directory = ${extract{directory}{VDOMAINDATA}} user = ${extract{user}{VDOMAINDATA}} group = ${extract{group}{VDOMAINDATA}} - data = ${if exists{${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}\ - {${lookup{$local_part}cdb\ - {${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}}}} + # Manually construct the forwarding address, preserving the + # local_part_suffix if the remote host is master. + data = ${if and {{exists{${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}}\ + {! eq {${lookup{$local_part}cdb\ + {${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}}}\ + {}}}\ + {${local_part:${lookup{$local_part}cdb\ + {${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}}}\ + ${if eq {${domain:${lookup{$local_part}cdb\ + {${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}}}}{master.debian.org}{$local_part_suffix} {}}\ + @\ + ${domain:${lookup{$local_part}cdb\ + {${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}}}}} domains = +virtual_domains file_transport = address_file headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}" @@ -1451,9 +1450,9 @@ virt_users: <%= out = "" -if scope.lookupvar('site::nodeinfo')['bugsmaster'] or scope.lookupvar('site::nodeinfo')['bugsmx'] +if @is_bugsmaster or @is_bugsmx domain = 'bugs.debian.org' - if scope.lookupvar('site::nodeinfo')['bugsmaster'] + if @is_bugsmaster domain = 'bugs-master.debian.org' end out = ' @@ -1563,7 +1562,7 @@ address_reply: remote_smtp: driver = smtp - connect_timeout = 1m + connect_timeout = 15s delay_after_cutoff = false tls_certificate = /etc/exim4/ssl/thishost.crt tls_privatekey = /etc/exim4/ssl/thishost.key @@ -1605,7 +1604,7 @@ bsmtp: {$value}fail}\ }} -<%- if scope.lookupvar('site::nodeinfo')['bugsmaster'] or scope.lookupvar('site::nodeinfo')['bugsmx'] -%> +<%- if @is_bugsmaster or @is_bugsmx -%> bugs_pipe: driver = pipe command = /org/bugs.debian.org/mail/run-procmail @@ -1618,7 +1617,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