Revert "increase spam message size limit"

[hcoop/config/exim.git] / conf.d / router / 850_exim4-config_lowuid

diff --git a/conf.d/router/850_exim4-config_lowuid b/conf.d/router/850_exim4-config_lowuid
index 43741c6..ef876b7 100644 (file)
--- a/conf.d/router/850_exim4-config_lowuid
+++ b/conf.d/router/850_exim4-config_lowuid
@@ -16,14 +16,34 @@ COND_SYSTEM_USER_AND_REMOTE_SUBMITTER = "\
                     {1}{0}\
                }"
 
-lowuid_aliases:
-  debug_print = "R: lowuid_aliases for $local_part@$domain (UID $local_user_uid)"
+# hcoop-change: separate local and remote router
+# hcoop-change: disable remote check since it interferes with relaying from hosts (should be in ACL)
+
+# lowuid_aliases_remote:
+#   debug_print = "R: lowuid_aliases_remote for $local_part@$domain (UID $local_user_uid)"
+#   check_local_user
+#   driver = redirect
+#   allow_fail
+#   domains = +unix_domains
+#   condition = COND_SYSTEM_USER_AND_REMOTE_SUBMITTER
+#   data = ${if exists{CONFDIR/lowuid-aliases}\
+#               {${lookup{$local_part}lsearch{CONFDIR/lowuid-aliases}\
+#               {$value}{DEFAULT_SYSTEM_ACCOUNT_ALIAS}}}\
+#               {DEFAULT_SYSTEM_ACCOUNT_ALIAS}}
+
+
+# hcoop-change: redirect all local low uid mail to one account
+COND_SYSTEM_USER = ${if <{$local_user_uid}{FIRST_USER_ACCOUNT_UID}{1}{0}}
+
+lowuid_aliases_local:
+  debug_print = "R: lowuid_aliases_local for $local_part@$domain (UID $local_user_uid)"
   check_local_user
   driver = redirect
   allow_fail
-  domains = +local_domains
-  condition = COND_SYSTEM_USER_AND_REMOTE_SUBMITTER
+  domains = +unix_domains
+  condition = COND_SYSTEM_USER
   data = ${if exists{CONFDIR/lowuid-aliases}\
               {${lookup{$local_part}lsearch{CONFDIR/lowuid-aliases}\
-              {$value}{DEFAULT_SYSTEM_ACCOUNT_ALIAS}}}\
-              {DEFAULT_SYSTEM_ACCOUNT_ALIAS}}
+              {$value}{HCOOP_SYSTEM_ACCOUNT_ALIAS}}}\
+              {HCOOP_SYSTEM_ACCOUNT_ALIAS}}
+