Muehlenhoff has submitted this change and it was merged. Change subject: Tools: Add add_environment/keep_environment to exim configurations ......................................................................
Tools: Add add_environment/keep_environment to exim configurations This change applies the concept of 92751486bff187f8149ce563b80947dbaf5d34f2 to the exim configurations used by the Tools project. Change-Id: I48d7aaaeeee1ad7fbdb80afa476f87df784fcbbf --- M modules/toollabs/templates/mail-relay.exim4.conf.erb M modules/toollabs/templates/route-to-mail-relay.exim4.conf.erb 2 files changed, 6 insertions(+), 0 deletions(-) Approvals: Muehlenhoff: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/modules/toollabs/templates/mail-relay.exim4.conf.erb b/modules/toollabs/templates/mail-relay.exim4.conf.erb index 9ca7f16..1b7f3ba 100644 --- a/modules/toollabs/templates/mail-relay.exim4.conf.erb +++ b/modules/toollabs/templates/mail-relay.exim4.conf.erb @@ -74,6 +74,9 @@ local_from_suffix = .* +add_environment = <; PATH=/bin:/usr/bin +keep_environment = + ############################### # Access Control Lists (ACLs) # ############################### diff --git a/modules/toollabs/templates/route-to-mail-relay.exim4.conf.erb b/modules/toollabs/templates/route-to-mail-relay.exim4.conf.erb index 9ed04f1..791958e 100644 --- a/modules/toollabs/templates/route-to-mail-relay.exim4.conf.erb +++ b/modules/toollabs/templates/route-to-mail-relay.exim4.conf.erb @@ -2,6 +2,9 @@ qualify_domain = <%= @mail_domain %> +add_environment = <; PATH=/bin:/usr/bin +keep_environment = + begin routers # Catch unqualified e-mail addresses from MediaWiki -- To view, visit https://gerrit.wikimedia.org/r/277866 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I48d7aaaeeee1ad7fbdb80afa476f87df784fcbbf Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Tim Landscheidt <[email protected]> Gerrit-Reviewer: Andrew Bogott <[email protected]> Gerrit-Reviewer: Faidon Liambotis <[email protected]> Gerrit-Reviewer: Merlijn van Deen <[email protected]> Gerrit-Reviewer: Muehlenhoff <[email protected]> Gerrit-Reviewer: Tim Landscheidt <[email protected]> Gerrit-Reviewer: Yuvipanda <[email protected]> Gerrit-Reviewer: coren <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
