Merge from master into 4.next

[exim.git] / test / confs / 0322

diff --git a/test/confs/0322 b/test/confs/0322
index 2901010ada9375f9fad92b5a1dd46b5f50edd793..396b0c65365fc52678c30f92c0f42d52d6a1f819 100644 (file)
--- a/test/confs/0322
+++ b/test/confs/0322
@@ -1,20 +1,11 @@
 # Exim test configuration 0322
 
-LS=
+.include DIR/aux-var/std_conf_prefix
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
 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 -----
 
-log_selector = LS
-
 # ----- Routers -----
 
 begin routers