mwolson: Get procmail delivery working

diff --git a/conf.d/router/700_exim4-config_procmail b/conf.d/router/700_exim4-config_procmail
index 8d827c7..4909305 100644 (file)
--- a/conf.d/router/700_exim4-config_procmail
+++ b/conf.d/router/700_exim4-config_procmail
@@ -8,7 +8,7 @@ procmail:
   # emulate OR with "if exists"-expansion
   require_files = ${local_part}:\
                   ${if exists{/etc/procmailrc}\
   # emulate OR with "if exists"-expansion
   require_files = ${local_part}:\
                   ${if exists{/etc/procmailrc}\

-                    {/etc/procmailrc}{${home}/.procmailrc}}:\
+                    {/etc/procmailrc}{${home}/.procmail.d/procmailrc}}:\

                   +/usr/bin/procmail
   no_verify
   no_expn
                   +/usr/bin/procmail
   no_verify
   no_expn

diff --git a/conf.d/transport/30_exim4-config_procmail_pipe b/conf.d/transport/30_exim4-config_procmail_pipe
index 5053911..0da57b1 100644 (file)
--- a/conf.d/transport/30_exim4-config_procmail_pipe
+++ b/conf.d/transport/30_exim4-config_procmail_pipe
@@ -6,8 +6,8 @@ procmail_pipe:
   driver = pipe
   path = "/bin:/usr/bin:/usr/local/bin"
   environment = AFS_IS=${run{/etc/exim4/get-token ${local_part}}{}}enabled
   driver = pipe
   path = "/bin:/usr/bin:/usr/local/bin"
   environment = AFS_IS=${run{/etc/exim4/get-token ${local_part}}{}}enabled

-  command = "/home/mwolson_admin/procmailtest"
-#  command = "/usr/bin/procmail"
+#  command = "/home/mwolson_admin/procmailtest"
+  command = /usr/bin/procmail ${home}/.procmail.d/procmailrc

   return_path_add
   delivery_date_add
   envelope_to_add
   return_path_add
   delivery_date_add
   envelope_to_add