Testsuite: tidying

[exim.git] / test / confs / 0022

diff --git a/test/confs/0022 b/test/confs/0022
index 2ec64d848e9dac678d5504cf505acf211b3c356e..e3fadf3e6ad6158121169a72f9cc49a1fa6211df 100644 (file)
--- a/test/confs/0022
+++ b/test/confs/0022
@@ -1,20 +1,17 @@
 # Exim test configuration 0022
 
 SERVER=
 # Exim test configuration 0022
 
 SERVER=

+CONTROL=
+
+.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

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

 
 # ----- Main settings -----
 
 hostlist some_hosts = net-lsearch;DIR/aux-var/TESTNUM.hosts
 
 
 # ----- Main settings -----
 
 hostlist some_hosts = net-lsearch;DIR/aux-var/TESTNUM.hosts
 

+CONTROL

 acl_smtp_rcpt = $local_part
 log_selector = +smtp_connection
 hosts_connection_nolog = : 127.0.0.1
 acl_smtp_rcpt = $local_part
 log_selector = +smtp_connection
 hosts_connection_nolog = : 127.0.0.1


@@ -66,7 +63,8 @@ delay_warn:
   accept
 
 freeze:
   accept
 
 freeze:

-  accept   control = freeze
+  accept   logwrite = Connections=$smtp_count_at_connection_start
+           control = freeze

 
 queue_only:
   accept   control = queue_only
 
 queue_only:
   accept   control = queue_only


@@ -95,6 +93,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