MySQL, pgsql: per-query server options outside the lookup string. Bug 2546

[users/heiko/exim.git] / test / confs / 2600

diff --git a/test/confs/2600 b/test/confs/2600
index c84d54fec9302253614d204a31c3bf67757cbcd1..e42cbe33c5f57e433a5498fc23b0215e383d19b8 100644 (file)
--- a/test/confs/2600
+++ b/test/confs/2600
@@ -1,13 +1,8 @@
 # Exim test configuration 2600
 
-exim_path = EXIM_PATH
-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 -----
 
@@ -19,6 +14,9 @@ hostlist   relay_hosts = sqlite;DIR/aux-fixed/sqlitedb \
 acl_smtp_rcpt = check_recipient
 sqlite_lock_timeout = 2
 
+.ifdef DATA
+sqlite_dbfile = DATA
+.endif
 
 # ----- ACL -----