X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=test%2Fconfs%2F2600;h=29f5afbbedb9850bb2f7460f23ee8fb5153dcf57;hb=6d9b05ae272ca2122b48451c317d601e449af932;hp=09eedef6871b164102d4c9388989d8eed0d2b498;hpb=afda344b580b54a4513569720aec3260cd5ba546;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/test/confs/2600 b/test/confs/2600
index 09eedef68..29f5afbbe 100644
--- a/test/confs/2600
+++ b/test/confs/2600
@@ -1,24 +1,28 @@
 # Exim test configuration 2600
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
 domainlist local_domains = @
+.ifdef OPT
+hostlist   relay_hosts = sqlite,file=DIR/aux-fixed/sqlitedb; \
+                                     select * from them where \
+                                     id='$sender_host_address'
+.else
 hostlist   relay_hosts = sqlite;DIR/aux-fixed/sqlitedb \
                                      select * from them where \
                                      id='$sender_host_address'
+.endif
 
 acl_smtp_rcpt = check_recipient
 sqlite_lock_timeout = 2
 
+.ifdef DATA
+sqlite_dbfile = DATA
+.endif
 
 # ----- ACL -----