coren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/63846
Change subject: Tool Labs: Add procmail to mail handling chain
......................................................................
Tool Labs: Add procmail to mail handling chain
(Iff user has a .procmailrc)
Change-Id: Ic7be4c14006758bd982a283df987d62ee93aa39a
---
M modules/toollabs/manifests/mailrelay.pp
M modules/toollabs/templates/exim4.conf.erb
2 files changed, 22 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/46/63846/1
diff --git a/modules/toollabs/manifests/mailrelay.pp
b/modules/toollabs/manifests/mailrelay.pp
index a2c92f9..148eb96 100644
--- a/modules/toollabs/manifests/mailrelay.pp
+++ b/modules/toollabs/manifests/mailrelay.pp
@@ -13,6 +13,10 @@
class toollabs::mailrelay($maildomain) inherits toollabs {
include toollabs::infrastructure
+ package { "procmail":
+ ensure => present,
+ }
+
file { "$store/mail-relay":
ensure => file,
owner => 'root',
diff --git a/modules/toollabs/templates/exim4.conf.erb
b/modules/toollabs/templates/exim4.conf.erb
index 691b8bf..4805c34 100644
--- a/modules/toollabs/templates/exim4.conf.erb
+++ b/modules/toollabs/templates/exim4.conf.erb
@@ -73,6 +73,14 @@
no_expn
check_ancestor
+userprocmail:
+ driver = accept
+ check_local_user
+ file = $home/.procmailrc
+ require_files = $local_part:$home/.procmailrc
+ no_verify
+ no_expn
+
localuser:
driver = accept
check_local_user
@@ -83,6 +91,16 @@
remote_smtp:
driver = smtp
+procmailpipe:
+ driver = pipe
+ command = "/usr/bin/procmail -d"
+ return_path_add
+ delivery_date_add
+ path = "/bin:/usr/bin:/usr/local/bin"
+ envelope_to_add
+ check_string = "From "
+ escape_string = ">From "
+
local_delivery:
driver = appendfile
file = <%= store %>/mail/$local_part
--
To view, visit https://gerrit.wikimedia.org/r/63846
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7be4c14006758bd982a283df987d62ee93aa39a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
