refactor

[exim.git] / test / confs / 0021

diff --git a/test/confs/0021 b/test/confs/0021
index 96dccd4af5f8b4d9184c5ae385173a6c94340279..8d252e884ccdd1e294f8b22e7044651aabade6a7 100644 (file)
--- a/test/confs/0021
+++ b/test/confs/0021
@@ -2,14 +2,12 @@
 
 SERVER=
 BR=
 
 SERVER=
 BR=

+HVH=
+LOG_SELECTOR=
+
+.include DIR/aux-var/std_conf_prefix

 
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns

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

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

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


@@ -25,6 +23,8 @@ acl_smtp_mail = mail
 acl_smtp_rcpt = rcpt
 
 BR
 acl_smtp_rcpt = rcpt
 
 BR

+HVH
+log_selector = LOG_SELECTOR

 
 qualify_domain = test.ex
 trusted_users = CALLER
 
 qualify_domain = test.ex
 trusted_users = CALLER


@@ -69,7 +69,7 @@ mail:
 rcpt:
   accept senders = +ok_senders
          sender_domains = +ok_sender_domains
 rcpt:
   accept senders = +ok_senders
          sender_domains = +ok_sender_domains

-         logwrite = :panic: rcpt accepted
+         logwrite = :panic: rcpt accepted C=$smtp_command_history

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


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

+  create_file = DIR/test-mail

   user = CALLER
 
 # End
   user = CALLER
 
 # End