DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0137

diff --git a/test/confs/0137 b/test/confs/0137
index b40c83c155803e09d0ad5b909be1c13f4cd0c428..c12709698a23b9d04d6cf294d16ad0788c5be597 100644 (file)
--- a/test/confs/0137
+++ b/test/confs/0137
@@ -1,18 +1,14 @@
 # Exim test configuration 0137
 
 # Exim test configuration 0137
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 

+log_selector = +subject

 domainlist local_domains = test.ex
 qualify_domain = test.ex
 domainlist local_domains = test.ex
 qualify_domain = test.ex

+untrusted_set_sender = *

 
 
 # ----- Routers -----
 
 
 # ----- Routers -----


@@ -22,7 +18,10 @@ begin routers
 smart:
   driver = accept
   retry_use_local_part
 smart:
   driver = accept
   retry_use_local_part

-  transport = $h_transport:
+  transport = ${if eq {t1}{$sender_address_local_part} {local_delivery} \
+               {${if eq {t2}{$sender_address_local_part} {local_delivery_fcntl} \
+               {${if eq {t3}{$sender_address_local_part} {local_delivery_fcntl_blocking} \
+               {} }}}}}

 
 
 # ----- Transports -----
 
 
 # ----- Transports -----


@@ -32,6 +31,7 @@ begin transports
 local_delivery:
   driver = appendfile
   file = DIR/test-mail/$local_part
 local_delivery:
   driver = appendfile
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   lock_interval = 1s
   lock_retries = 2
   user = CALLER
   lock_interval = 1s
   lock_retries = 2
   user = CALLER


@@ -39,6 +39,7 @@ local_delivery:
 local_delivery_fcntl:
   driver = appendfile
   file = DIR/test-mail/$local_part
 local_delivery_fcntl:
   driver = appendfile
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   lock_interval = 1s
   lock_retries = 2
   no_use_lockfile
   lock_interval = 1s
   lock_retries = 2
   no_use_lockfile


@@ -47,6 +48,7 @@ local_delivery_fcntl:
 local_delivery_fcntl_blocking:
   driver = appendfile
   file = DIR/test-mail/$local_part
 local_delivery_fcntl_blocking:
   driver = appendfile
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   lock_fcntl_timeout = 2s
   lock_interval = 1s
   lock_retries = 2
   lock_fcntl_timeout = 2s
   lock_interval = 1s
   lock_retries = 2