Faidon Liambotis has submitted this change and it was merged.
Change subject: exim: kill one-size-fits-all SMTP_IMAP_MM template
......................................................................
exim: kill one-size-fits-all SMTP_IMAP_MM template
Now that users of exim::roled have been migrated into templates of their
own, remove the broader exim4.conf.SMTP_IMAP_MM.erb template that should
be now unused.
Change-Id: I31c7e25c2a85474cfb8d4929246bbb647a8e074f
---
M manifests/mail.pp
D templates/exim/exim4.conf.SMTP_IMAP_MM.erb
2 files changed, 1 insertion(+), 718 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/mail.pp b/manifests/mail.pp
index 8d6691f..2385f01 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -77,8 +77,7 @@
$config_template = template('exim/exim4.conf.mx.erb')
$filter_template = template('exim/system_filter.conf.erb')
} else {
- $config_template = template('exim/exim4.conf.SMTP_IMAP_MM.erb')
- $filter_template = template('exim/system_filter.conf.erb')
+ fail('Unrecognized exim role type')
}
class { 'exim4':
diff --git a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
deleted file mode 100644
index f8487e7..0000000
--- a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
+++ /dev/null
@@ -1,716 +0,0 @@
-# This file is managed by puppet
-
-##########
-# Macros #
-##########
-
-CONFDIR=/etc/exim4
-WIKI_INTERFACE=<; 208.80.154.91 ; 2620:0:861:3:208:80:154:91
-
-<% if @enable_mailman == true then -%>
-# Mailman
-MAILMAN_HOME = /usr/lib/mailman
-MAILMAN_LISTS_HOME = /var/lib/mailman
-MAILMAN_WRAP = MAILMAN_HOME/mail/mailman
-MAILMAN_UID = list
-MAILMAN_GID = list
-
-<% end -%>
-<% if @enable_otrs_server == true then -%>
-# OTRS
-OTRS_POSTMASTER=/opt/otrs/bin/otrs.PostMaster.pl
-OTRS_HOME=/var/lib/otrs
-OTRS_USER=otrs
-OTRS_GROUP=www-data
-<% end -%>
-OTRSQUERY=SELECT value0 FROM system_address WHERE
value0='${quote_mysql:$local_part@$domain}' AND valid_id=1;
-
-VERP_BOUNCE_LOCALPART_REGEXP = \N^wiki-\w+-\w+-\w+-[+/\w]+$\N
-
-###############################
-# Main configuration settings #
-###############################
-
-<% if @enable_mail_relay == "primary" or @enable_otrs_server == true then -%>
-# MySQL lookups (OTRS)
-hide mysql_servers = m2-master.eqiad.wmnet/otrs/exim/<%=
scope.lookupvar('exim::smtp::otrs_mysql_password') %> :
m2-slave.eqiad.wmnet/otrs/exim/<%=
scope.lookupvar('exim::smtp::otrs_mysql_password') %>
-<% end -%>
-
-<% if @enable_mail_relay == "primary" then -%>
-# LDAP lookups (Office)
-ldap_default_servers = ldap-mirror.wikimedia.org
-LDAPPASSWORD=<%= scope.lookupvar('exim::smtp::smtp_ldap_password') %>
-<% end -%>
-
-domainlist system_domains = @
-domainlist local_domains = <%= @local_domains.join(" : ") %>
-domainlist wikimedia_domains = lsearch;CONFDIR/wikimedia_domains
-domainlist verp_domains = <%= @verp_domains.join(" : ") %>
-<% if @enable_mail_relay != false %>
-domainlist relay_domains = +wikimedia_domains
-<% end -%>
-
-# a list of domains to always respond defer; used for emergencies or planned
downtimes
-domainlist defer_domains = lsearch;CONFDIR/defer_domains
-
-# Standard lists
-domainlist legacy_mailman_domains = wikimedia.org : wikipedia.org
-domainlist mailman_domains = lists.wikimedia.org
-domainlist rt_domains = rt.wikimedia.org
-domainlist phab_domains = phabricator.wikimedia.org
-domainlist donate_domains = donate.wikimedia.org
-
-hostlist wikimedia_nets = <; <%=
scope.lookupvar('network::constants::all_networks').join(" ; ") %>
-hostlist relay_from_hosts = <; @[] ; 127.0.0.1 ; ::1 ; <% if
@enable_mail_relay != false -%><%=
scope.lookupvar('network::constants::external_networks').join(" ; ") %>;
10.0.0.0/8<% end %>
-<% if @enable_otrs_server == true then -%>
-
-# Interfaces
-daemon_smtp_ports = smtp
-<% end -%>
-
-# Administration
-log_selector = +address_rewrite +all_parents +delivery_size +deliver_time
+incoming_interface +incoming_port +smtp_confirmation +smtp_protocol_error
+smtp_syntax_error +tls_cipher +tls_peerdn
-<% if @enable_otrs_server == false then -%>
-message_logs = false
-<% end -%>
-
-# Policy control
-acl_smtp_connect = acl_check_connect
-acl_smtp_rcpt = acl_check_rcpt
-acl_smtp_data = acl_check_data
-
-<% if @enable_mail_relay != false or @enable_otrs_server == true then -%>
-helo_try_verify_hosts = *
-<% end -%>
-
-<% if @rt_relay == true or @enable_otrs_server == true or @phab_relay == true
then -%>
-# Allow Phab, RT, OTRS to use any sender address
-untrusted_set_sender = *
-local_from_check = false
-<% end -%>
-
-system_filter = CONFDIR/system_filter
-
-# Resource control
-check_spool_space = 50M
-smtp_reserve_hosts = <; 127.0.0.1 ; ::1 ; +wikimedia_nets
-smtp_accept_queue_per_connection = 500
-
-deliver_queue_load_max = 800.0
-queue_only_load = 100.0
-remote_max_parallel = 500
-
-smtp_connect_backlog = 128
-smtp_receive_timeout = 1m
-smtp_accept_max = 4000
-smtp_accept_max_per_host = ${if
match_ip{$sender_host_address}{+wikimedia_nets}{50}{5}}
-smtp_accept_reserve = 100
-
-# Lookups
-host_lookup = *
-rfc1413_hosts =
-<% if @enable_spamassassin == true then -%>
-
-# Content filtering
-spamd_address = 127.0.0.1 783
-<% end %>
-<% if @enable_clamav == true then -%>
-
-# Malware scanning
-av_scanner = clamd:/var/run/clamav/clamd.ctl
-<% end %>
-
-# Other
-never_users = root : daemon : bin
-ignore_bounce_errors_after = 0h
-
-# force Gmail over IPv4 due to reports of bad spam reputation over IPv6
-dns_ipv4_lookup = gmail-smtp-in.l.google.com : aspmx.l.google.com
-
-###############################
-# Access Control Lists (ACLs) #
-###############################
-
-begin acl
-
-acl_check_rcpt:
-
-<% if @enable_mail_relay != false then -%>
- # If there have been ~4 times as many previous RCPT rejects than
- # accepts, drop the connection
- drop message = Too many ($rcpt_fail_count) rejected recipients, good bye
- hosts = ! +wikimedia_nets
- condition = ${if
>={$rcpt_fail_count}{${eval:4*($recipients_count+1)}}}
-<% end -%>
-
- # Accept if the source is local SMTP (a pipe)
- accept hosts = :
-
- # Deny if the local part contains @, %, /, | or !, or starts with a dot
- deny local_parts = ^.*[@%!/|] : ^\\.
-
- # Accept relaying from networks we control. Note: no address
verification
- # is done at this point, which is good for mail submission, but may
render
- # recipient callout verification by affected hosts useless.
- accept domains = ! +local_domains
- hosts = +relay_from_hosts
- control = submission/sender_retain
-
-<% if @enable_otrs_server == true then -%>
- # Require recipient domain to be local
- require message = Relay not permitted
- domains = +local_domains
- set acl_m_relayed = yes
-<% else -%>
- # Require recipient domain to be local, or a domain we relay for
- require message = Relay not permitted
- domains = +local_domains : +relay_domains
- set acl_m_relayed = yes
-
- # use this only for emergencies or planned downtimes
- defer message = Administratively set to defer
- domains = +defer_domains
-
- # Accept mail for postmaster without further policy checking,
- # for compliance with the RFCs
- accept local_parts = postmaster : abuse
- set acl_m2 = skip_spamd
-<% end -%>
-
- # Verify the recipient address for local domains, or require the
- # recipient domain to exist for remote domains
- require verify = recipient
-
-<% if @enable_mail_relay != false then -%>
- # If the destination domain is a domain we relay for,
- # check if the local part exists at the destination,
- # reject if it doesn't.
- # Accept if the destination cannot be reached within 30s.
- deny domains = +relay_domains
- ! verify = recipient/callout=10s,maxwait=30s,defer_ok
-<% end -%>
-
- <% if @enable_mail_relay != false then -%>
- # Check whether the sender address domain exists
- require verify = sender
-
- <% end -%>
- accept
-
-acl_check_connect:
-<% if @mediawiki_relay == true then -%>
- # Deny external connections to the internal bulk mail submission
interface
- deny condition = ${if
match_ip{$interface_address}{WIKI_INTERFACE}{true}{false}}
- ! hosts = +wikimedia_nets
-
-<% end -%>
-<% if @enable_external_mail == false then -%>
- # We only accept mail from our own mail relays
- require message = This server does not accept external mail
- hosts = <; 127.0.0.0/8 ; ::1 ; +wikimedia_nets
-<% end -%>
- accept
-
-acl_check_data:
-<% if ( @enable_spamassassin == true ) then -%>
-<% if ( @enable_otrs_server == true ) then -%>
- # skip spam-check for locally-submitted messages
- accept hosts = +relay_from_hosts
- set acl_m0 = trusted relay
-
- # skip if message is too large (>4M)
- accept condition = ${if >{$message_size}{4M}}
- set acl_m0 = n/a
- set acl_m1 = skipped, message too large
-
- # add spam headers...
- warn spam = nonexistent:true
- set acl_m0 = $spam_score ($spam_bar)
- set acl_m1 = $spam_report
- set acl_m3 = $spam_score_int
-
- # silently drop spam at high scores (> 12)
- discard log_message = spam detected ($spam_score)
- condition = ${if >{$spam_score_int}{120}{1}{0}}
-<% else -%>
- # Let's trust local senders to not send out spam
- accept hosts = +wikimedia_nets
- set acl_m0 = trusted relay
-
- # Only run through SpamAssassin if requested for this domain and
- # the message is not too large
- accept condition = ${if >{$message_size}{400K}}
-
- # Skip if so requested
- accept condition = ${if eq{$acl_m2}{skip_spamd}}
-
- # Add spam headers if score >= 1
- warn spam = nonexistent:true
- condition = ${if >{$spam_score_int}{10}{1}{0}}
- set acl_m0 = $spam_score ($spam_bar)
- set acl_m1 = $spam_report
-
- # Reject spam at high scores (> 12)
- deny message = This message scored $spam_score spam points.
- spam = nonexistent/defer_ok
- condition = ${if >{$spam_score_int}{120}{1}{0}}
-<% end -%>
-<% end -%>
-<% if @enable_clamav == true then -%>
-
- # silently discard messages with malware attached
- discard log_message = malware detected ($malware_name)
- demime = *
- malware = *
-<% end -%>
-
- accept
-
-###########
-# Routers #
-###########
-
-begin routers
-
-<% if @enable_mailman == true then -%>
-list_outbound:
- driver = dnslookup
- domains = ! +local_domains
- senders = *@lists.wikimedia.org
- condition = ${if match_ip{$sender_host_address}{@[]}}
- transport = list_smtp
- no_verify
-
-<% end -%>
-<% if @mediawiki_relay == true then -%>
-# Route mail generated by MediaWiki differently
-wiki_mail:
- driver = dnslookup
- domains = ! +local_domains
- condition = ${if
and{{match_ip{$interface_address}{WIKI_INTERFACE}}{eqi{$header_X-Mailer:}{MediaWiki
mailer}}}}
- transport = bulk_smtp
- ignore_target_hosts = <; 0.0.0.0 ; 127.0.0.0/8 ; 10/8 ; 172.16/12 ;
192.168/16
- no_verify
-
-<% end -%>
-<% if @enable_mail_relay != false then -%>
-# Send donate.wikimedia.org mail to Fundraising CiviCRM server
-donate:
- driver = manualroute
- domains = +donate_domains
- route_list = * barium.frack.eqiad.wmnet byname
- transport = remote_smtp
-
-# Route non-local domains (including +relay_domains) via DNS MX and A records
-dnslookup:
- driver = dnslookup
- domains = ! +local_domains
- transport = ${if eq
{$acl_m_relayed}{yes}{remote_smtp}{remote_smtp_signed}}
- ignore_target_hosts = <; 0.0.0.0 ; 127.0.0.0/8 ; 10/8 ; 172.16/12 ;
192.168/16
- cannot_route_message = Cannot route to remote domain $domain
- no_more
-
-# Route bounce emails
-mw_verp_api:
- driver = accept
- domains = +verp_domains
- condition = ${if
match{$local_part}{VERP_BOUNCE_LOCALPART_REGEXP}{true}{false}}
- transport = mwverpbounceprocessor
-
-eat:
- driver = redirect
- domains = +local_domains
- local_parts = no-reply-notifications
- data = :blackhole:
-<% end -%>
-
-# Use the system aliasfile /etc/aliases for system domains
-system_aliases:
- driver = redirect
- domains = +system_domains
- data = ${lookup{$local_part}lsearch{/etc/aliases}}
- pipe_transport = address_pipe
- allow_fail
- allow_defer
- forbid_file
-
-<% if @phab_relay == true then -%>
-# Mail destined for Phabricator
-
-eat:
- driver = redirect
- domains = +phab_domains
- local_parts = no-reply
- data = :blackhole:
-
-phabricator_bound:
- driver = redirect
- domains = +phab_domains
- redirect_router = phab
- data = general$local_part_suffix@$domain
- no_verify
-
-phab:
- driver = accept
- domains = +phab_domains
- transport = phab_pipe
-<% end -%>
-
-<% if @rt_relay == true then -%>
-# Mail destined for RT
-
-# Special alias file for the RT domain
-rt_aliases:
- driver = redirect
- domains = +rt_domains
- require_files = CONFDIR/aliases/rt
- data = ${lookup{$local_part}lsearch*{CONFDIR/aliases/rt}}
- qualify_preserve_domain
- allow_fail
- allow_defer
- forbid_file
- forbid_pipe
- include_directory = CONFDIR
-
-# This router checks whether the local part consists of solely digits,
-# and assumes this is the ticket number of an existing ticket if this is
-# the case. It rewrites the address to the general queue, and puts the
-# ticket nr in $address_data, where the rt_pipe transport can access it.
-rt_ticket:
- driver = redirect
- domains = +rt_domains
- local_part_suffix = -comment
- local_part_suffix_optional
- condition = ${if match{$local_part}{\N^\d+$\N}{yes}{no}}
- address_data = EXTENSION=$local_part
- data = general$local_part_suffix@$domain
- redirect_router = rt
- no_verify
-
-rt:
- driver = accept
- domains = +rt_domains
- local_part_suffix = -comment
- local_part_suffix_optional
- transport = rt_pipe
-
-<% end -%>
-<% if @enable_mailman == true then -%>
-# Mailman list handling
-list_aliases:
- driver = redirect
- domains = +local_domains
- require_files = CONFDIR/aliases/$domain
- data = ${lookup{$local_part}lsearch*{CONFDIR/aliases/$domain}}
- qualify_preserve_domain
- allow_fail
- allow_defer
- forbid_file
- forbid_pipe
- include_directory = CONFDIR
-
-# Test the mailing list address without suffix
-# first, as a mailing list like wikifi-admin is a valid list name.
-list:
- driver = accept
- domains = +mailman_domains
- require_files = MAILMAN_LISTS_HOME/lists/$local_part/config.pck
- transport = list
-
-list_suffix:
- driver = accept
- domains = +mailman_domains
- require_files = MAILMAN_LISTS_HOME/lists/$local_part/config.pck
- local_part_suffix = -bounces : -bounces+* : \
- -confirm+* : -join : -leave : \
- -owner : -request : -admin : \
- -subscribe : -unsubscribe
- transport = list
-<% end -%>
-<% if @enable_mail_relay == "primary" then -%>
-# Use alias files /etc/exim4/aliases/$domain for domains like
-# wikimedia.org, wikipedia.org, wiktionary.org etc.
-aliases:
- driver = redirect
- domains = +local_domains
- require_files = CONFDIR/aliases/$domain
- data = ${lookup{$local_part}lsearch*{CONFDIR/aliases/$domain}}
- qualify_preserve_domain
- allow_fail
- allow_defer
- forbid_file
- include_directory = CONFDIR
- pipe_transport = address_pipe
-
-# Alias old mailing list addresses to @lists.wikimedia.org
-legacy_mailing_lists:
- driver = redirect
- domains = +legacy_mailman_domains
- data = [email protected]
- local_parts = lsearch;CONFDIR/legacy_mailing_lists
- local_part_suffix = -bounces : -bounces+* : \
- -confirm+* : -join : -leave : \
- -owner : -request : -admin : \
- -subscribe : -unsubscribe
- local_part_suffix_optional
-
-# LDAP accounts
-ldap_account:
- driver = manualroute
- domains = wikimedia.org
- condition = ${lookup ldap \
-
{user="cn=eximagent,ou=other,dc=corp,dc=wikimedia,dc=org" pass=LDAPPASSWORD \
-
ldap:///ou=people,dc=corp,dc=wikimedia,dc=org?mail?sub?(&(objectClass=inetOrgPerson)(mail=${quote_ldap:$local_part}@$domain)(x121Address=1))}
\
- {true}fail}
- local_part_suffix = +*
- local_part_suffix_optional
- transport = remote_smtp
- route_list = * aspmx.l.google.com
-
-ldap_group:
- driver = manualroute
- domains = wikimedia.org
- condition = ${lookup ldap \
-
{user="cn=eximagent,ou=other,dc=corp,dc=wikimedia,dc=org" pass=LDAPPASSWORD \
-
ldap:///ou=groups,dc=corp,dc=wikimedia,dc=org?businessCategory?sub?(businessCategory=${quote_ldap:$local_part}@$domain)}
\
- {true}fail}
- local_part_suffix = +*
- local_part_suffix_optional
- transport = remote_smtp
- route_list = * aspmx.l.google.com
-
-ldap_alias:
- driver = redirect
- domains = wikimedia.org
- data = ${lookup ldap \
-
{user="cn=eximagent,ou=other,dc=corp,dc=wikimedia,dc=org" pass=LDAPPASSWORD \
-
ldap:///ou=people,dc=corp,dc=wikimedia,dc=org?mail?sub?(&(objectClass=inetOrgPerson)(initials=${quote_ldap:$local_part}@$domain)(x121Address=1))}
\
- {$value}fail}
-
-# send phabricator.wm.org emails to Phabricator
-phabricator:
- driver = manualroute
- domains = +phab_domains
- route_list = * iridium.eqiad.wmnet byname
- transport = remote_smtp
-
-# Send RT mails to the RT server
-rt:
- driver = manualroute
- domains = +rt_domains
- route_list = * magnesium.wikimedia.org byname
- transport = remote_smtp
-
-# Query the OTRS MySQL server(s) for the existence of the queue address
-# $local_part@$domain, and manually route to the OTRS server if
-# successful.
-otrs:
- driver = manualroute
- domains = +local_domains
- condition = ${lookup mysql{OTRSQUERY}{true}fail}
- route_list = * iodine.wikimedia.org byname
- transport = remote_smtp
-<% end %>
-<% if @enable_mail_relay != false then -%>
-
-# Redirect postmaster@$domain if it hasn't been accepted before
-postmaster:
- driver = redirect
- domains = +local_domains
- local_parts = postmaster
- data = postmaster@$primary_hostname
-<% end %>
-<% if @enable_mailman == true then -%>
- cannot_route_message = Mailing list $local_part does not exist.
-<% elsif @enable_mail_relay != false then -%>
- cannot_route_message = Address $local_part@$domain does not exist
-<% end %>
-<% if @enable_otrs_server == true then -%>
-otrs:
- driver = accept
- condition = ${lookup mysql{OTRSQUERY}{true}fail}
- transport = otrs
-<% end %>
-
-<% if !@smart_route_list.empty? then -%>
-# Send all mail not destined for the local machine via a set of
-# mail relays ("smart hosts")
-smart_route:
- driver = manualroute
- transport = remote_smtp
- # root should alias to root@wikimedia
- <% if @enable_otrs_server == true then -%>
- # OTRS receives emails for project domains
- # (such as info-en @ wikipedia.org), defined dynamically in its
database.
- route_list = * <%= @smart_route_list.join(":") %>
- <% else -%>
- # Local mail is undeliverable and remote mail is forwarded
- route_list = !+local_domains <%= @smart_route_list.join(":") %>
- <% end -%>
-<% end %>
-
-##############
-# Transports #
-##############
-
-begin transports
-
-# Generic remote SMTP transport
-
-remote_smtp:
- driver = smtp
- hosts_avoid_tls = <; 0.0.0.0/0 ; 0::0/0
-<% if !@outbound_ips.empty? then -%>
- interface = <; <%= @outbound_ips.join(" ; ") %>
-<% end -%>
-
-remote_smtp_signed:
- driver = smtp
- hosts_avoid_tls = <; 0.0.0.0/0 ; 0::0/0
- dkim_domain = wikimedia.org
- dkim_selector = wikimedia
- dkim_private_key = ${if
exists{/etc/exim4/dkim/${dkim_domain}-${dkim_selector}.key}{/etc/exim4/dkim/${dkim_domain}-${dkim_selector}.key}{0}}
- dkim_canon = relaxed
-<% if !@outbound_ips.empty? then -%>
- interface = <; <%= @outbound_ips.join(" ; ") %>
-<% end -%>
-
-<% if @enable_mailman == true -%>
-list_smtp:
- driver = smtp
- hosts_avoid_tls = <; 0.0.0.0/0 ; 0::0/0
- interface = <; <%= @list_outbound_ips.join(" ; ") %>
- helo_data = lists.wikimedia.org
- dkim_domain = lists.wikimedia.org
- dkim_selector = wikimedia
- dkim_private_key = ${if
exists{/etc/exim4/dkim/${dkim_domain}-${dkim_selector}.key}{/etc/exim4/dkim/${dkim_domain}-${dkim_selector}.key}{0}}
- dkim_canon = relaxed
-<% end -%>
-
-<% if @mediawiki_relay == true -%>
-# Transport for sending out automated bulk (wiki) mail
-# DKIM signed with wikimedia.org irrespective of actual sender domain
-# but using a separate selector that only allows "wiki" as the local part
-bulk_smtp:
- driver = smtp
- hosts_avoid_tls = <; 0.0.0.0/0 ; 0::0/0
- interface = WIKI_INTERFACE
- helo_data = ${lookup
dnsdb{ptr=$sending_ip_address}{$value}{wiki-mail.wikimedia.org}}
- dkim_domain = wikimedia.org
- dkim_selector = wiki-mail
- dkim_private_key = ${if
exists{/etc/exim4/dkim/${dkim_domain}-${dkim_selector}.key}{/etc/exim4/dkim/${dkim_domain}-${dkim_selector}.key}{0}}
- dkim_canon = relaxed
-<% end -%>
-
-# Generic pipe local delivery transport (for use by alias/forward files)
-
-address_pipe:
- driver = pipe
- return_output
-
-<% if @phab_relay == true then -%>
-# phabricator transport
-phab_pipe:
- driver = pipe
- batch_max = 5
- command = /usr/local/bin/phab_epipe.py
- environment = $address_data
- user = mail
- group = mail
- return_fail_output
-<% end -%>
-
-<% if @rt_relay == true then -%>
-# RT transport
-rt_pipe:
- driver = pipe
- command = /usr/bin/rt-mailgate --queue $local_part \
- --action "${if
eq{$local_part_suffix}{-comment}{comment}{correspond}}" \
- --extension ticket --url https://rt.wikimedia.org
- environment = $address_data : PERL_LWP_SSL_VERIFY_HOSTNAME=0
- user = mail
- group = mail
- return_fail_output
-
-<% end -%>
-<% if @enable_otrs_server == true then -%>
-# OTRS pipe transport
-otrs:
- driver = pipe
- command = OTRS_POSTMASTER
- current_directory = OTRS_HOME
- home_directory = OTRS_HOME
- user = OTRS_USER
- group = OTRS_GROUP
- freeze_exec_fail
- log_fail_output
- timeout = 1m
- timeout_defer
-
-<% end -%>
-<% if @enable_mailman == true then -%>
-# Mailman pipe transport
-# Rewrite body headers of old mailing list addresses to new ones
-list:
- driver = pipe
- command = MAILMAN_WRAP \
- '${if def:local_part_suffix \
- {${sg{$local_part_suffix}{-(\\w+)(\\+.*)?}{\$1}}} \
- {post}}' \
- $local_part
- current_directory = MAILMAN_LISTS_HOME
- home_directory = MAILMAN_LISTS_HOME
- user = MAILMAN_UID
- group = MAILMAN_GID
- #headers_rewrite = \N^.*@(mail\.)?wiki[mp]edia\.org$\N "${if
exists{MAILMAN_LISTS_HOME/lists/$local_part/config.pck}{[email protected]}fail}"
ct
-
-<% end %>
-
-# POST VERP bounce emails to a MediaWiki 'bouncehandler' API
-mwverpbounceprocessor:
- driver = pipe
- command = /usr/bin/curl -H 'Host: <%= @verp_post_connect_server %>' <%=
@verp_bounce_post_url %> -d "action=bouncehandler" --data-urlencode "email@-"
-o /dev/null
- user = nobody
- group = nogroup
-
-###############
-# Retry rules #
-###############
-
-begin retry
-
-<% if @mediawiki_relay == true then -%>
-* * [email protected] F,1h,15m; G,8h,1h,1.5
-<% end -%>
-* * F,2h,15m; G,16h,1h,1.5; F,4d,6h
-<% if ( @enable_mail_relay != false ) -%>
-
-#################
-# Rewrite rules #
-#################
-
-begin rewrite
-
-<% end %>
-<% if @rt_relay == true then -%>
-#################
-# Rewrite rules #
-#################
-
-begin rewrite
-
-# Rewrite RT
-www-data@$primary_hostname [email protected] Fq
-
-<% end -%>
-<% if @enable_mailman == true then -%>
-\N^.*@(mail\.)?wiki[mp]edia\.org$\N "${if
exists{MAILMAN_LISTS_HOME/lists/$local_part/config.pck}{[email protected]}fail}"
ct
-<% end %>
-<% if ( @enable_mail_relay != false ) -%>
-# Rewrite the envelope From for mails from internal servers in *.site.wmnet,
-# as they are usually rejected by sender domain address verification.
-*@*.eqiad.wmnet [email protected] F
-*@*.codfw.wmnet [email protected] F
-*@*.esams.wmnet [email protected] F
-*@*.ulsfo.wmnet [email protected] F
-<% end -%>
--
To view, visit https://gerrit.wikimedia.org/r/216641
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I31c7e25c2a85474cfb8d4929246bbb647a8e074f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
