Jgreen has submitted this change and it was merged.
Change subject: make exim otrs choose db's within site
......................................................................
make exim otrs choose db's within site
Change-Id: Ibcbf4df3d7b8191c26ac2f33ee5a5e5d6dabb49c
---
M templates/exim/exim4.conf.SMTP_IMAP_MM.erb
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Jgreen: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
index e057e96..8801dd7 100644
--- a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
+++ b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
@@ -34,8 +34,12 @@
<% if enable_mail_relay == "primary" or enable_otrs_server == "true" then -%>
# MySQL lookups (OTRS)
+<% if site == "eqiad" -%>
+hide mysql_servers = db1048.eqiad.wmnet/otrs/exim/<%=
scope.lookupvar('exim::smtp::otrs_mysql_password') %> :
db1046.pmtpa.wmnet/otrs/exim/<%=
scope.lookupvar('exim::smtp::otrs_mysql_password') %>
+<% else -%>
hide mysql_servers = db48.pmtpa.wmnet/otrs/exim/<%=
scope.lookupvar('exim::smtp::otrs_mysql_password') %> :
db49.pmtpa.wmnet/otrs/exim/<%=
scope.lookupvar('exim::smtp::otrs_mysql_password') %>
<% end -%>
+<% end -%>
<% if enable_mail_relay == "primary" then -%>
# LDAP lookups (Office)
--
To view, visit https://gerrit.wikimedia.org/r/77977
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibcbf4df3d7b8191c26ac2f33ee5a5e5d6dabb49c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen <[email protected]>
Gerrit-Reviewer: Jgreen <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
