Merge branch '4.next'

[users/jgh/exim.git] / test / confs / 0322

diff --git a/test/confs/0322 b/test/confs/0322
index 94864147aaadd1fbd79ce954c3146a6243387714..f78739673dd9ad7276a02c154ad3c8c15336785e 100644 (file)
--- a/test/confs/0322
+++ b/test/confs/0322
@@ -1,21 +1,11 @@
 # Exim test configuration 0322
 
 # Exim test configuration 0322
 

-LS=
+.include DIR/aux-var/std_conf_prefix

 
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns

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

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

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

-log_selector = LS
-

 # ----- Routers -----
 
 begin routers
 # ----- Routers -----
 
 begin routers


@@ -39,6 +29,7 @@ smtp:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End