Jgreen has uploaded a new change for review. https://gerrit.wikimedia.org/r/77846
Change subject: disable ssmtp for otrs ...................................................................... disable ssmtp for otrs Change-Id: I41824238d54be87dddc0c3c1b485d274bd84fe5c --- M templates/exim/exim4.conf.SMTP_IMAP_MM.erb 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/46/77846/1 diff --git a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb index d703788..613ee4d 100644 --- a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb +++ b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb @@ -70,10 +70,14 @@ <% if enable_otrs_server == "true" then -%> hostlist otrs_mail_from_hosts = mchenry.wikimedia.org <% end -%> -<% if enable_imap_delivery == "true" or enable_otrs_server == "true" then -%> +<% if enable_imap_delivery == "true" then -%> # Interfaces daemon_smtp_ports = smtp : ssmtp +<% elsif ( enable_otrs_server == "true" ) then -%> + +# Interfaces +daemon_smtp_ports = smtp <% end -%> # Administration -- To view, visit https://gerrit.wikimedia.org/r/77846 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I41824238d54be87dddc0c3c1b485d274bd84fe5c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Jgreen <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
