X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=test%2Fconfs%2F2600;h=29f5afbbedb9850bb2f7460f23ee8fb5153dcf57;hb=90e0b2485d19eea5e93b5adad2fbcce5fc48a237;hp=ea855471ea341259fab87a0018719e6c670b5d21;hpb=d1af83598f7d6b32516a11bb28e569d592a05c48;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/test/confs/2600 b/test/confs/2600
index ea855471e..29f5afbbe 100644
--- a/test/confs/2600
+++ b/test/confs/2600
@@ -1,25 +1,28 @@
 # Exim test configuration 2600
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 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 -----
 
 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 -----