refactor

[exim.git] / test / confs / 0619

diff --git a/test/confs/0619 b/test/confs/0619
index dcb7fa89e56c097296c4ed178b2a6e8508429d99..0736be60a252339b88955e5279cdde055b719629 100644 (file)
--- a/test/confs/0619
+++ b/test/confs/0619
@@ -1,30 +1,24 @@
 # Exim test configuration 0619
 
-LOG_SELECTOR=
+.include DIR/aux-var/std_conf_prefix
 
-keep_environment = PATH
-exim_path = EXIM_PATH
-spool_directory = DIR/spool
 
-log_file_path = DIR/spool/log/%slog
-
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-chunking_advertise_hosts =
-tls_advertise_hosts =
-
-.ifdef _HAVE_DMARC
-dmarc_tld_file =
-.endif
+# ----- Main settings -----
 
-primary_hostname = myhost.test.ex
-queue_only
+primary_hostname = primaryhostname.ex
+hosts_treat_as_local = 46.test.ex
+allow_domain_literals
 
-# ----- Main settings -----
+acl_smtp_rcpt = chk_rcpt
 
-log_selector = LOG_SELECTOR
+# ----- ACL -----
 
-acl_not_smtp = accept
+begin acl
 
+chk_rcpt:
+  accept       domains = OPT
+               logwrite = domain $domain
+               logwrite = value  $domain_data
+               logwrite = \$0 '$0'  \$1 '$1'
 
 # End