Andrew Bogott has submitted this change and it was merged.
Change subject: Replaced enable_mediawiki_relay with mediawiki_relay.
......................................................................
Replaced enable_mediawiki_relay with mediawiki_relay.
The latter is defined as a local variable in the calling class;
the former is not defined anywhere.
Also, fixed a logic switch that was reversed, as suggested
by Mark.
Change-Id: Ib19c80334eccc09df3303958f19e2b4cae1c9a17
---
M templates/exim/exim4.conf.SMTP_IMAP_MM.erb
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Andrew Bogott: Verified; Looks good to me, approved
Mark Bergsma: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
index a81ba8b..0a14673 100644
--- a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
+++ b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
@@ -211,7 +211,7 @@
<% end -%>
acl_check_connect:
-<% if scope.lookupvar('exim::roled::enable_mediawiki_relay') != "true" then -%>
+<% if mediawiki_relay == "true" then -%>
# Deny external connections to the internal bulk mail submission
# interface
@@ -273,7 +273,7 @@
no_more
<% end %>
-<% if scope.lookupvar('exim::roled::enable_mediawiki_relay') == "true" then -%>
+<% if mediawiki_relay == "true" then -%>
# Route mail generated by MediaWiki differently
wiki_mail:
domains = ! +local_domains
@@ -558,7 +558,7 @@
helo_data = lists.wikimedia.org
<% end -%>
-<% if scope.lookupvar('exim::roled::enable_mediawiki_relay') == "true" -%>
+<% if mediawiki_relay == "true" -%>
# Transport for sending out automated bulk (wiki) mail
bulk_smtp:
driver = smtp
@@ -677,7 +677,7 @@
begin retry
-<% if scope.lookupvar('exim::roled::enable_mediawiki_relay') == "true" then -%>
+<% if mediawiki_relay == "true" then -%>
* * senders=w...@wikimedia.org F,1h,15m; G,8
<% end -%>
* * F,2h,15m; G,16h,1h,1.5; F,4d,6h
--
To view, visit https://gerrit.wikimedia.org/r/67882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib19c80334eccc09df3303958f19e2b4cae1c9a17
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
