Alexandros Kosiaris has submitted this change and it was merged.
Change subject: otrs: Do not hardcode mx hosts
......................................................................
otrs: Do not hardcode mx hosts
Replace the recently hardcoded mx1001, mx2001 with the $::mail_smarthost
variable
Change-Id: I420c382791e7f335117d7e7dd31df701a553a792
---
M modules/role/manifests/otrs/webserver.pp
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/modules/role/manifests/otrs/webserver.pp
b/modules/role/manifests/otrs/webserver.pp
index e895a08..73e847b 100644
--- a/modules/role/manifests/otrs/webserver.pp
+++ b/modules/role/manifests/otrs/webserver.pp
@@ -48,10 +48,11 @@
port => '80',
}
+ $smtp_ferm = join($::mail_smarthost, ' ')
ferm::service { 'otrs_smtp':
proto => 'tcp',
port => '25',
- srange => '@resolve((mx1001.wikimedia.org mx2001.wikimedia.org))',
+ srange => "@resolve((${smtp_ferm}))",
}
monitoring::service { 'smtp':
--
To view, visit https://gerrit.wikimedia.org/r/297354
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I420c382791e7f335117d7e7dd31df701a553a792
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
