DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0575

diff --git a/test/confs/0575 b/test/confs/0575
index 89bc77fb282b356afa211f131799f40e018c459b..e99bba9176439d8ecb33ae3b89e1c9046d36d364 100644 (file)
--- a/test/confs/0575
+++ b/test/confs/0575
@@ -1,46 +1,13 @@
 # Exim test configuration 0575
 
 # Exim test configuration 0575
 

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

 
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

 
 

-log_selector = +received_recipients +sender_on_delivery
+# ----- Main settings -----

 
 

-acl_smtp_rcpt = rcpt
-queue_only
-queue_run_in_order
+primary_hostname = mail.test.ex
+qualify_domain = test.ex

 
 

-#---------------
-
-begin acl
-
-rcpt:
-  accept
-    queue = ${if eq {normal}{$local_part} {} {$local_part}}
-    logwrite = using queue '$queue_name'
-
-#---------------
-
-begin routers
-
-all:
-  driver = accept
-  transport = dump
-
-#---------------
-
-begin transports
-
-dump:
-  driver = pipe
-  command = true
+acl_smtp_rcpt = accept

 
 # End
 
 # End

-