Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/277866

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(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/66/277866/1

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: newchange
Gerrit-Change-Id: I48d7aaaeeee1ad7fbdb80afa476f87df784fcbbf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to