merge hcoop transport configuration changes

diff --git a/conf.d/transport/30_exim4-config_address_file b/conf.d/transport/30_exim4-config_address_file
index 82b55e2..67e089c 100644 (file)
--- a/conf.d/transport/30_exim4-config_address_file
+++ b/conf.d/transport/30_exim4-config_address_file
@@ -2,9 +2,11 @@
 # This transport is used for handling deliveries directly to files that are
 # generated by aliasing or forwarding.
 #
+# hcoop-change: Add bogus group line to make sure get-token gets executed
 address_file:
   debug_print = "T: address_file for $local_part@$domain"
   driver = appendfile
+  group = mail${run{/etc/exim4/get-token ${local_part}}{}}
   delivery_date_add
   envelope_to_add
   return_path_add

diff --git a/conf.d/transport/30_exim4-config_address_pipe b/conf.d/transport/30_exim4-config_address_pipe
index c5f1828..1c19408 100644 (file)
--- a/conf.d/transport/30_exim4-config_address_pipe
+++ b/conf.d/transport/30_exim4-config_address_pipe
@@ -3,8 +3,12 @@
 # .forward files. If the commands fails and produces any output on standard
 # output or standard error streams, the output is returned to the sender
 # of the message as a delivery error.
+#
+# hcoop-change: Set a nonsensical environment variable in order that a
+# the token-acquiring command may be run
 address_pipe:
   debug_print = "T: address_pipe for $local_part@$domain"
   driver = pipe
+  environment = AFS_IS=${run{/etc/exim4/get-token ${local_part}}{}}enabled
   return_fail_output
 

diff --git a/conf.d/transport/30_exim4-config_maildir_home b/conf.d/transport/30_exim4-config_maildir_home
index a872acc..594cc0e 100644 (file)
--- a/conf.d/transport/30_exim4-config_maildir_home
+++ b/conf.d/transport/30_exim4-config_maildir_home
@@ -5,11 +5,15 @@
 # Use this instead of mail_spool if you want to to deliver to Maildir in
 # home-directory - change the definition of LOCAL_DELIVERY
 #
+# hcoop-change: Deliver to
+# MAILDIR_HOME_MAILDIR_LOCATION/l/lo/$local_part
+#
+# hcoop-change: Make sure get-token gets executed
 maildir_home:
   debug_print = "T: maildir_home for $local_part@$domain"
   driver = appendfile
   .ifdef MAILDIR_HOME_MAILDIR_LOCATION
-  directory = MAILDIR_HOME_MAILDIR_LOCATION
+  directory = MAILDIR_HOME_MAILDIR_LOCATION/${length_1:$local_part}/${length_2:$local_part}/${local_part}${run{/etc/exim4/get-token ${local_part}}{}}
   .else
   directory = $home/Maildir
   .endif
@@ -38,4 +42,8 @@ maildir_home:
   # $home is not accessible, this chdir fails and prevents delivery.
   # If you are in a setup where home directories might not be
   # accessible, uncomment the current_directory line below.
-  # current_directory = /
+  #
+  # hcoop-change: uncommented this
+  current_directory = /
+  # hcoop-change: Try 20 times rather than 10 before deferring.
+  maildir_retries = 20

diff --git a/conf.d/transport/30_exim4-config_maildrop_pipe b/conf.d/transport/30_exim4-config_maildrop_pipe
index 0ba27bc..edfc8ba 100644 (file)
--- a/conf.d/transport/30_exim4-config_maildrop_pipe
+++ b/conf.d/transport/30_exim4-config_maildrop_pipe
@@ -1,8 +1,11 @@
+# hcoop-change: Set a nonsensical environment variable in order that a
+# the token-acquiring command may be run
 
 maildrop_pipe:
   debug_print = "T: maildrop_pipe for $local_part@$domain"
   driver = pipe
   path = "/bin:/usr/bin:/usr/local/bin"
+  environment = AFS_IS=${run{/etc/exim4/get-token ${local_part}}{}}enabled
   command = "/usr/bin/maildrop"
   return_path_add
   delivery_date_add

diff --git a/conf.d/transport/30_exim4-config_procmail_pipe b/conf.d/transport/30_exim4-config_procmail_pipe
index 5fb03ff..0da57b1 100644 (file)
--- a/conf.d/transport/30_exim4-config_procmail_pipe
+++ b/conf.d/transport/30_exim4-config_procmail_pipe
@@ -1,9 +1,13 @@
+# hcoop-change: Set a nonsensical environment variable in order that a
+# the token-acquiring command may be run
 
 procmail_pipe:
   debug_print = "T: procmail_pipe for $local_part@$domain"
   driver = pipe
   path = "/bin:/usr/bin:/usr/local/bin"
-  command = "/usr/bin/procmail"
+  environment = AFS_IS=${run{/etc/exim4/get-token ${local_part}}{}}enabled
+#  command = "/home/mwolson_admin/procmailtest"
+  command = /usr/bin/procmail ${home}/.procmail.d/procmailrc
   return_path_add
   delivery_date_add
   envelope_to_add

diff --git a/conf.d/transport/35_exim4-config_address_directory b/conf.d/transport/35_exim4-config_address_directory
index 6861426..47d8962 100644 (file)
--- a/conf.d/transport/35_exim4-config_address_directory
+++ b/conf.d/transport/35_exim4-config_address_directory
@@ -2,9 +2,12 @@
 # or .forward files if the path ends in "/", which causes it to be treated
 # as a directory name rather than a file name.
 
+# hcoop-change: Add bogus group line to make sure get-token gets executed
+
 address_directory:
   debug_print = "T: address_directory for $local_part@$domain"
   driver = appendfile
+  group = mail${run{/etc/exim4/get-token ${local_part}}{}}
   delivery_date_add
   envelope_to_add
   return_path_add