Docs: use verified version of local_part variable in router require_files example

[users/heiko/exim.git] / test / confs / 0001

diff --git a/test/confs/0001 b/test/confs/0001
index 0fd7efe44c702433e6700514a1897a9f6bb7c428..c8ad6f43fecfab27f4a0257ac8ac0751291113ab 100644 (file)
--- a/test/confs/0001
+++ b/test/confs/0001
@@ -54,6 +54,7 @@ daemon_smtp_port =
 daemon_smtp_ports =
 daemon_startup_retries = 3
 daemon_startup_sleep = 8s
 daemon_smtp_ports =
 daemon_startup_retries = 3
 daemon_startup_sleep = 8s

+debug_store

 delay_warning = 1d
 delay_warning_condition = ${if match{$h_precedence:}{(?i)bulk|list}{no}{yes}}
 deliver_drop_privilege
 delay_warning = 1d
 delay_warning_condition = ${if match{$h_precedence:}{(?i)bulk|list}{no}{yes}}
 deliver_drop_privilege


@@ -94,7 +95,6 @@ no_local_from_check
 local_from_prefix = *-
 local_from_suffix = =*
 local_interfaces =
 local_from_prefix = *-
 local_from_suffix = =*
 local_interfaces =

-local_scan_timeout = 10s

 local_sender_retain
 localhost_number = "3 "
 log_selector =  \
 local_sender_retain
 localhost_number = "3 "
 log_selector =  \


@@ -193,12 +193,13 @@ no_strip_excess_angle_brackets
 no_strip_trailing_dot
 no_syslog_duplication
 syslog_facility = uucp
 no_strip_trailing_dot
 no_syslog_duplication
 syslog_facility = uucp

+no_syslog_pid

 syslog_processname = mta-exim
 no_syslog_timestamp
 system_filter = /home/exim/test/filter
 system_filter_directory_transport =
 system_filter_file_transport =
 syslog_processname = mta-exim
 no_syslog_timestamp
 system_filter = /home/exim/test/filter
 system_filter_directory_transport =
 system_filter_file_transport =

-system_filter_group = mail
+system_filter_group = MAILGROUP

 system_filter_pipe_transport =
 system_filter_reply_transport =
 system_filter_user = 99
 system_filter_pipe_transport =
 system_filter_reply_transport =
 system_filter_user = 99


@@ -207,7 +208,7 @@ timeout_frozen_after = 7d
 timezone = EDT
 tls_advertise_hosts =
 trusted_groups = 42
 timezone = EDT
 tls_advertise_hosts =
 trusted_groups = 42

-trusted_users = ${readfile{DIR/aux-fixed/TESTNUM.trusted}{:}}
+trusted_users = ${readfile{DIR/aux-var/TESTNUM.trusted}{:}}

 unknown_login = unknownlogin
 unknown_username = Exim Testing
 untrusted_set_sender = *
 unknown_login = unknownlogin
 unknown_username = Exim Testing
 untrusted_set_sender = *


@@ -236,7 +237,7 @@ manualroute:
   no_fail_verify_recipient
   no_fail_verify_sender
   fallback_hosts = localhost
   no_fail_verify_recipient
   no_fail_verify_sender
   fallback_hosts = localhost

-  group = mail
+  group = MAILGROUP

   headers_add =
   headers_remove =
   host_find_failed = freeze
   headers_add =
   headers_remove =
   host_find_failed = freeze


@@ -370,7 +371,7 @@ forward:
   forbid_filter_run
   no_forbid_include
   no_forbid_pipe
   forbid_filter_run
   no_forbid_include
   no_forbid_pipe

-  group = mail
+  group = MAILGROUP

   headers_add =
   headers_remove =
   hide_child_in_errmsg
   headers_add =
   headers_remove =
   hide_child_in_errmsg


@@ -386,7 +387,7 @@ forward:
   more
   no_one_time
   owners = root
   more
   no_one_time
   owners = root

-  owngroups = mail
+  owngroups = MAILGROUP

   pipe_transport = dummy
   no_qualify_preserve_domain
   redirect_router = aliasfile2
   pipe_transport = dummy
   no_qualify_preserve_domain
   redirect_router = aliasfile2


@@ -420,7 +421,7 @@ localuser:
   no_fail_verify_recipient
   no_fail_verify_sender
   fallback_hosts =
   no_fail_verify_recipient
   no_fail_verify_sender
   fallback_hosts =

-  group = mail
+  group = MAILGROUP

   headers_add = X-added: by localuser
   headers_remove =
   no_initgroups
   headers_add = X-added: by localuser
   headers_remove =
   no_initgroups


@@ -460,7 +461,7 @@ smartuser:
   file_transport = dummy
   forbid_file
   forbid_pipe
   file_transport = dummy
   forbid_file
   forbid_pipe

-  group = mail
+  group = MAILGROUP

   headers_add =
   headers_remove =
   hide_child_in_errmsg
   headers_add =
   headers_remove =
   hide_child_in_errmsg


@@ -516,10 +517,10 @@ appendfile:
   directory_mode = 0700
   envelope_to_add
   escape_string = xyz
   directory_mode = 0700
   envelope_to_add
   escape_string = xyz

-  file = /home/$local_part/inbox
+  file = /home/${bless:$local_part}/inbox

   file_format = "From : appendfile"
   no_file_must_exist
   file_format = "From : appendfile"
   no_file_must_exist

-  group = mail
+  group = MAILGROUP

   headers_add = X-original-domain: $original_domain\nX-original-localp: $original_local_part
   headers_remove =
   headers_rewrite = a@b c@d
   headers_add = X-original-domain: $original_domain\nX-original-localp: $original_local_part
   headers_remove =
   headers_rewrite = a@b c@d


@@ -530,7 +531,7 @@ appendfile:
   lockfile_timeout = 30m
   mailbox_size = 1000
   mailbox_filecount = 9999
   lockfile_timeout = 30m
   mailbox_size = 1000
   mailbox_filecount = 9999

-  message_size_limit = 1M
+  message_size_limit = 1G

   mode = 0600
   mode_fail_narrower
   no_notify_comsat
   mode = 0600
   mode_fail_narrower
   no_notify_comsat