Collect spool-layout code to one file

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

diff --git a/test/confs/0525 b/test/confs/0525
index f30696241ed2e34ebf1df5c84612e0f6ee05a984..e1e736d4d9d6b836cb335a2b95f3d8f1ada1ec30 100644 (file)
--- a/test/confs/0525
+++ b/test/confs/0525
@@ -1,13 +1,14 @@
 # Exim test configuration 0525
 
 exim_path = EXIM_PATH
 # Exim test configuration 0525
 
 exim_path = EXIM_PATH

+keep_environment =

 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 host_lookup_order = bydns
 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
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME

+tls_advertise_hosts =

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -37,7 +38,6 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

-  interface = 127.0.0.1

   allow_localhost
   data_timeout = 1s
 
   allow_localhost
   data_timeout = 1s