mwolson: Use U/US/USER style paths for exim mail delivery

diff --git a/conf.d/transport/30_exim4-config_maildir_home b/conf.d/transport/30_exim4-config_maildir_home
index 2705667..f94b209 100644 (file)
--- a/conf.d/transport/30_exim4-config_maildir_home
+++ b/conf.d/transport/30_exim4-config_maildir_home
@@ -5,14 +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/$local_part
+# 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/$local_part${run{/etc/exim4/get-token ${local_part}}{}}
+  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

diff --git a/get-token b/get-token
old mode 100644 (file)
new mode 100755 (executable)
index a7f6cb8..6754ade
--- a/get-token
+++ b/get-token
@@ -8,7 +8,7 @@ export KRB5CCNAME=FILE:/tmp/krb5cc_$USER.email
 kdestroy
 unlog
 KEYTAB=/etc/keytabs/mailfilter/$USER
-echo kinit -kt $KEYTAB $USER/mailfilter@HCOOP.NET
+echo kinit -kt $KEYTAB $USER/mailfilter@HCOOP.NET > /tmp/exim-get-token-log
 kinit -kt $KEYTAB $USER/mailfilter@HCOOP.NET
 aklog