Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/67882
Change subject: Remove switches that depend on enable_mediawiki_relay.
......................................................................
Remove switches that depend on enable_mediawiki_relay.
enable_mediawiki_relay does not seem to be defined anywhere,
so presumably lookups of this variable are never == 'true'.
Change-Id: Ib19c80334eccc09df3303958f19e2b4cae1c9a17
---
M templates/exim/exim4.conf.SMTP_IMAP_MM.erb
1 file changed, 0 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/82/67882/1
diff --git a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
index a81ba8b..b9d21fa 100644
--- a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
+++ b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
@@ -211,14 +211,11 @@
<% end -%>
acl_check_connect:
-<% if scope.lookupvar('exim::roled::enable_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 -%>
accept
acl_check_data:
@@ -272,17 +269,6 @@
cannot_route_message = Primary MX(s) for $domain not in the allowed list
no_more
-<% end %>
-<% if scope.lookupvar('exim::roled::enable_mediawiki_relay') == "true" then -%>
-# Route mail generated by MediaWiki differently
-wiki_mail:
-domains = ! +local_domains
- driver = dnslookup
- condition = ${if
and{{match_ip{$interface_address}{WIKI_INTERFACE}}{eqi{$header_X-Mailer:}{MediaWiki
mailer}}}}
- errors_to = [email protected]
- 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 -%>
# Route non-local domains (including +relay_domains) via DNS MX and A records
@@ -558,15 +544,6 @@
helo_data = lists.wikimedia.org
<% end -%>
-<% if scope.lookupvar('exim::roled::enable_mediawiki_relay') == "true" -%>
-# Transport for sending out automated bulk (wiki) mail
-bulk_smtp:
- driver = smtp
- hosts_avoid_tls = <; 0.0.0.0/0 ; 0::0/0
- interface = WIKI_INTERFACE
- helo_data = <; wiki-mail.wikimedia.org ; lists.wikimedia.org
-<% end -%>
-
# Generic pipe local delivery transport (for use by alias/forward files)
address_pipe:
@@ -677,9 +654,6 @@
begin retry
-<% if scope.lookupvar('exim::roled::enable_mediawiki_relay') == "true" then -%>
-* * [email protected] F,1h,15m; G,8
-<% end -%>
* * F,2h,15m; G,16h,1h,1.5; F,4d,6h
<% if ( enable_mail_relay != "false" ) -%>
--
To view, visit https://gerrit.wikimedia.org/r/67882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib19c80334eccc09df3303958f19e2b4cae1c9a17
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
