Jgreen has submitted this change and it was merged.
Change subject: grr. disable relay in template when we haven't enabled it in
parameters
......................................................................
grr. disable relay in template when we haven't enabled it in parameters
Change-Id: I176c4cb5567eaebc6b384454194aa285f1c8e6df
---
M templates/exim/exim4.conf.SMTP_IMAP_MM.erb
1 file changed, 8 insertions(+), 2 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 b63e030..01205fa 100644
--- a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
+++ b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
@@ -186,12 +186,18 @@
message = This port is restricted to authenticated and
encrypted mail submissions
condition = ${if eq{$interface_port}{25}}
<% end -%>
+
+<% if enable_otrs_server == "true" then -%>
+ # Require recipient domain to be local
+
+ require message = Relay not permitted
+ domains = +local_domains
+<% else -%>
# Require recipient domain to be local, or a domain we relay for
require message = Relay not permitted
domains = +local_domains : +relay_domains <% if
enable_mail_relay == "secondary" then -%>: +secondary_domains<% end %>
-<% if enable_otrs_server == "false" then -%>
# { recipient domain is under our administrative control }
# use this only for emergencies or planned downtimes
@@ -202,8 +208,8 @@
# for compliance with the RFCs
accept local_parts = postmaster
-
<% end -%>
+
# Verify the recipient address for local domains, or require the
# recipient domain to exist for remote domains
--
To view, visit https://gerrit.wikimedia.org/r/77832
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I176c4cb5567eaebc6b384454194aa285f1c8e6df
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
