coren has submitted this change and it was merged.
Change subject: Tool Labs: Mail works, redirecting /var/mail
......................................................................
Tool Labs: Mail works, redirecting /var/mail
Change-Id: Ifeb5d66ca07ad9b3635fbf8444ae9d3f55368ad0
---
M modules/toollabs/manifests/init.pp
M modules/toollabs/templates/exim4.conf.erb
2 files changed, 8 insertions(+), 0 deletions(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/manifests/init.pp
b/modules/toollabs/manifests/init.pp
index 905dc6d..7b958b1 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -104,5 +104,11 @@
source => [ "$store/mail-relay",
"puppet:///modules/toollabs/exim4-norelay.conf" ],
}
+ file { "/var/mail":
+ ensure => link,
+ force => true,
+ target => "$store/mail",
+ }
+
}
diff --git a/modules/toollabs/templates/exim4.conf.erb
b/modules/toollabs/templates/exim4.conf.erb
index 4af8e15..c69908b 100644
--- a/modules/toollabs/templates/exim4.conf.erb
+++ b/modules/toollabs/templates/exim4.conf.erb
@@ -15,6 +15,8 @@
ignore_bounce_errors_after = 2d
timeout_frozen_after = 7d
+begin acl
+
acl_check_rcpt:
accept hosts = :
deny message = Restricted characters in address
--
To view, visit https://gerrit.wikimedia.org/r/63400
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifeb5d66ca07ad9b3635fbf8444ae9d3f55368ad0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
