Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: exim: fix scoping
......................................................................
exim: fix scoping
Change-Id: I30cb22bbe1629de38a34b119455a43662bcc2d2c
---
M templates/exim/exim4.donate.erb
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/exim/exim4.donate.erb b/templates/exim/exim4.donate.erb
index 84a2b92..c8626be 100644
--- a/templates/exim/exim4.donate.erb
+++ b/templates/exim/exim4.donate.erb
@@ -132,7 +132,7 @@
allow_defer
forbid_file
-<% if exim_bounce_collector == "true" then -%>
+<% if scope.lookupvar('role::fundraising::civicrm::exim_bounce_collector') ==
"true" then -%>
# Deliver bounce-*@donate.wikimedia.org to mbox
bounce_mail:
@@ -161,7 +161,7 @@
driver = smtp
hosts_avoid_tls = <; 0.0.0.0/0 ; 0::0/0
connection_max_messages = 300
-<% if exim_signs_dkim == "true" then -%>
+<% if scope.lookupvar('role::fundraising::civicrm::exim_signs_dkim') == "true"
then -%>
dkim_domain = wikimedia.org
dkim_selector = fundraising
dkim_private_key = /etc/exim4/wikimedia.org-fundraising-private.key
@@ -178,7 +178,7 @@
command_timeout = 30s
data_timeout = 30s
final_timeout = 1m
-<% if exim_signs_dkim == "true" then -%>
+<% if scope.lookupvar('role::fundraising::civicrm::exim_signs_dkim') == "true"
then -%>
dkim_domain = wikimedia.org
dkim_selector = fundraising
dkim_private_key = /etc/exim4/wikimedia.org-fundraising-private.key
@@ -204,7 +204,7 @@
user = civimail
group = civimail
-<% if exim_bounce_collector == "true" then -%>
+<% if scope.lookupvar('role::fundraising::civicrm::exim_bounce_collector') ==
"true" then -%>
bounce_mail_delivery:
driver = appendfile
file = /var/mail/bounce
--
To view, visit https://gerrit.wikimedia.org/r/119496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I30cb22bbe1629de38a34b119455a43662bcc2d2c
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Jgreen <jgr...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
