# 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 scope.function_has_role('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
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 scope.function_has_role('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
out = "daemon_smtp_ports = "
ports << 25
-if scope.lookupvar('site::nodeinfo')['bugsmaster'] or scope.lookupvar('site::nodeinfo')['bugsmx']
+if scope.function_has_role('bugsmaster') or scope.function_has_role('bugsmx')
ports << 587
end
ports << scope.lookupvar('site::nodeinfo')['mail_port']
end
-if scope.lookupvar('site::nodeinfo')['mailrelay']
+if scope.function_has_role('mailrelay')
ports << scope.lookupvar('site::nodeinfo')['smarthost_port']
end
hosts = !+debianhosts
set acl_m_rprf = localonly
-<%- if scope.lookupvar('site::nodeinfo')['mailrelay'] -%>
+<%- if scope.function_has_role('mailrelay') -%>
warn local_parts = +local_only_users
domains = +mailhubdomains
hosts = !+debianhosts
<%- end -%>
accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}}
-<%- if scope.lookupvar('site::nodeinfo')['rtmaster'] -%>
+<%- if scope.function_has_role('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 scope.function_has_role('bugsmaster') or scope.function_has_role('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 scope.function_has_role('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 scope.function_has_role('packagesqamaster') -%>
warn recipients = owner@packages.qa.debian.org : postmaster@packages.qa.debian.org
set acl_m_rprf = PTSOwner
warn set acl_c_scr = 0
-<%- if scope.lookupvar('site::nodeinfo')['mailrelay'] -%>
+<%- if scope.function_has_role('mailrelay') -%>
accept verify = certificate
<%- end -%>
# We do this by testing for an empty sending host field.
accept hosts = +debianhosts
-<%- if scope.lookupvar('site::nodeinfo')['mailrelay'] -%>
+<%- if scope.function_has_role('mailrelay') -%>
accept verify = certificate
<%- end -%>
endpass
verify = recipient
-<%- if scope.lookupvar('site::nodeinfo')['mailrelay'] -%>
+<%- if scope.function_has_role('mailrelay') -%>
accept domains = +mailhubdomains
endpass
verify = recipient/callout=30s,defer_ok,use_sender,no_cache
#!!# ACL that is used after the RCPT command
check_recipient:
-<%- if scope.lookupvar('site::nodeinfo')['mailrelay'] -%>
+<%- if scope.function_has_role('mailrelay') -%>
accept verify = certificate
<%- end -%>
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 scope.function_has_role('packagesmaster') -%>
warn condition = ${if eq {$acl_m_prf}{PackagesMail}}
condition = ${if eq {$sender_address}{$local_part@$domain}}
message = X-Packages-FromTo-Same: yes
condition = ${if eq{$acl_m_act}{450}{yes}{no}}
<%- end -%>
-<%- if scope.lookupvar('site::nodeinfo')['rtmaster'] -%>
+<%- if scope.function_has_role('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
message = "Sender verification failed: $acl_verify_message"
<%- end -%>
-<%- if scope.lookupvar('site::nodeinfo')['mailrelay'] -%>
+<%- if scope.function_has_role('mailrelay') -%>
accept domains = +mailhubdomains
endpass
verify = recipient/callout=30s,defer_ok,use_sender,no_cache
# header. Take their crack pipe away.
drop condition = ${if match{${lc:$h_From:}}{\Npostmaster@([^.]+\.)?debian\.org\N}}
-<%- if scope.lookupvar('site::nodeinfo')['rtmaster'] -%>
+<%- if scope.function_has_role('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}} \
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 scope.function_has_role('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
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
!verify = header_sender
message = No valid sender found in the From:, Sender: and Reply-to: headers
-<%- if scope.lookupvar('site::nodeinfo')['packagesmaster'] -%>
+<%- if scope.function_has_role('packagesmaster') -%>
deny message = Congratulations, you scored $spam_score points.
log_message = spam: $spam_score points.
condition = ${if eq {$acl_m_prf}{PackagesMail}}
# An address is passed to each in turn until it is accepted. #
######################################################################
-<%- if scope.lookupvar('site::nodeinfo')['mailrelay'] -%>
+<%- if scope.function_has_role('mailrelay') -%>
relay_manualroute:
driver = manualroute
domains = +mailhubdomains
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}"
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
#
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
#
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
# Everything before here should apply only to the local domains with a
# domains= rule
-<%- if scope.lookupvar('site::nodeinfo')['packagesmaster'] -%>
+<%- if scope.function_has_role('packagesmaster') -%>
# This router delivers for packages.d.o
packages:
debug_print = "R: packages for $local_part@$domain"
no_more
<%- end -%>
-<%- if scope.lookupvar('site::nodeinfo')['rtmaster'] -%>
+<%- if scope.function_has_role('rtmaster') -%>
# This router delivers for rt.d.o
rt_force_new_verbose:
debug_print = "R: rt for $local_part+new@$domain"
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}"
<%=
out = ""
-if scope.lookupvar('site::nodeinfo')['bugsmaster'] or scope.lookupvar('site::nodeinfo')['bugsmx']
+if scope.function_has_role('bugsmaster') or scope.function_has_role('bugsmx')
domain = 'bugs.debian.org'
- if scope.lookupvar('site::nodeinfo')['bugsmaster']
+ if scope.function_has_role('bugsmaster')
domain = 'bugs-master.debian.org'
end
out = '
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
{$value}fail}\
}}
-<%- if scope.lookupvar('site::nodeinfo')['bugsmaster'] or scope.lookupvar('site::nodeinfo')['bugsmx'] -%>
+<%- if scope.function_has_role('bugsmaster') or scope.function_has_role('bugsmx') -%>
bugs_pipe:
driver = pipe
command = /org/bugs.debian.org/mail/run-procmail
user = debbugs
<%- end -%>
-<%- if scope.lookupvar('site::nodeinfo')['rtmaster'] -%>
+<%- if scope.function_has_role('rtmaster') -%>
rt_pipe:
debug_print = "T: rt_pipe for $local_part${local_part_suffix}@$domain"
driver = pipe
projects / dsa-puppet.git / blobdiff