DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0092

diff --git a/test/confs/0092 b/test/confs/0092
index 62157cb3306b09a1d1d1e96129218914ee15be31..cdcf52330f8e7c6a84ec46f5548e3fde3408f792 100644 (file)
--- a/test/confs/0092
+++ b/test/confs/0092
@@ -7,19 +7,18 @@ domainlist local_domains = test.ex : *.test.ex
 
 domainlist relay_domains = test.ex
 
 
 domainlist relay_domains = test.ex
 

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

 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

 
 # ----- Main settings -----
 
 OPT = 2s
 
 # ----- Main settings -----
 
 OPT = 2s

+
+.ifndef COM

 smtp_receive_timeout = OPT
 receive_timeout = 2s
 smtp_receive_timeout = OPT
 receive_timeout = 2s

+.endif

 
 
 begin acl
 
 
 begin acl