Jgreen has submitted this change and it was merged.
Change subject: fight with puppet re. exim variables
......................................................................
fight with puppet re. exim variables
Change-Id: I1b585b50469acb1b351c012a09feb0498b7fad7f
---
M manifests/role/otrs.pp
M templates/exim/exim4.otrs.erb
2 files changed, 2 insertions(+), 3 deletions(-)
Approvals:
Jgreen: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/otrs.pp b/manifests/role/otrs.pp
index 6cfffcb..24ff2cb 100644
--- a/manifests/role/otrs.pp
+++ b/manifests/role/otrs.pp
@@ -41,8 +41,7 @@
class role::otrs::mailserver {
- include exim::smtp,
- exim::constants,
+ include passwords::exim4,
network::constants
class { 'spamassassin':
diff --git a/templates/exim/exim4.otrs.erb b/templates/exim/exim4.otrs.erb
index 7f944e4..a22113a 100644
--- a/templates/exim/exim4.otrs.erb
+++ b/templates/exim/exim4.otrs.erb
@@ -17,7 +17,7 @@
###############################
# MySQL lookups (OTRS)
-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') %>
+hide mysql_servers = db48.pmtpa.wmnet/otrs/exim/<%=
scope.lookupvar('passwords::exim4::otrs_mysql_password') %> :
db49.pmtpa.wmnet/otrs/exim/<%=
scope.lookupvar('passwords::exim4::otrs_mysql_password') %>
# Standard lists
hostlist wikimedia_nets = <; <%=
scope.lookupvar('network::constants::all_networks').join(" ; ") %>
--
To view, visit https://gerrit.wikimedia.org/r/77472
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1b585b50469acb1b351c012a09feb0498b7fad7f
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
