Merge branch 'hs/fix-proxy-bh' (Closes 2656)

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

diff --git a/test/confs/0095 b/test/confs/0095
index 1bd71acaa17b4223e22c78caf31ebce113c6023b..b1201f8709a7bc5871c380f3dba1646a1ad3c8f3 100644 (file)
--- a/test/confs/0095
+++ b/test/confs/0095
@@ -1,16 +1,15 @@
 # Exim test configuration 0095
 
 # Exim test configuration 0095
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+ERT=
+QWM=
+
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

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

+ERT

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


@@ -40,21 +39,22 @@ begin transports
 
 appendfile:
   driver = appendfile
 
 appendfile:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   quota = $h_quota
   quota_warn_threshold = $h_threshold
   quota = $h_quota
   quota_warn_threshold = $h_threshold

+  QWM

   user = CALLER
 
 appendfile2:
   driver = appendfile
   user = CALLER
 
 appendfile2:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   quota = $h_quota
   quota_warn_threshold = $h_threshold
   user = CALLER
 
 appendfile3:
   driver = appendfile
   quota = $h_quota
   quota_warn_threshold = $h_threshold
   user = CALLER
 
 appendfile3:
   driver = appendfile

-  file = DIR/test-mail/$local_part${if eq{$sender_address}{}{.bounce}}
+  file = DIR/test-mail/${bless:$local_part}${if eq{$sender_address}{}{.bounce}}

   quota_warn_threshold = $h_threshold
   user = CALLER
   headers_add = X:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   quota_warn_threshold = $h_threshold
   user = CALLER
   headers_add = X:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa