Jgreen has submitted this change and it was merged.
Change subject: fix truncated mysql query in exim4 conf for otrs
......................................................................
fix truncated mysql query in exim4 conf for otrs
Change-Id: I2a8bdfe80e8cac6bd517cd9825ec3e7c2435b3fc
---
M templates/exim/exim4.conf.SMTP_IMAP_MM.erb
1 file changed, 1 insertion(+), 4 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 21db152..e5617a3 100644
--- a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
+++ b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
@@ -362,7 +362,6 @@
transport = rt_pipe
<% end -%>
-
<% if enable_mailman == "true" then -%>
# Mailman list handling.
@@ -378,7 +377,6 @@
forbid_pipe
include_directory = CONFDIR
<% end -%>
-
<% if ( enable_mail_relay == "primary" ) -%>
aliases:
driver = redirect
@@ -392,7 +390,6 @@
include_directory = CONFDIR
pipe_transport = address_pipe
<% end -%>
-
<% if enable_mailman == "true" then -%>
# Test the mailing list address without suffix
# first, as a mailing list like wikifi-admin is a valid list name.
@@ -598,7 +595,7 @@
<% if (enable_otrs_server == "true" ) -%>
otrs:
driver = accept
- condition = ${lookup mysql{SELECT value0 FROM system_
+ condition = ${lookup mysql{SELECT value0 FROM system_address WHERE
value0='${quote_mysql:$local_part@$domain}'}{true}fail}
transport = otrs
<% end %>
--
To view, visit https://gerrit.wikimedia.org/r/77826
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a8bdfe80e8cac6bd517cd9825ec3e7c2435b3fc
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
