Default to filesystem space/inode checking enabled

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

diff --git a/test/confs/0900 b/test/confs/0900
index 427669c4bf1e29a61cb9c9a2c0c37659e5b8faaa..21fbf0901ead4e2e3aed4e55f596ac2b58a79615 100644 (file)
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -1,8 +1,7 @@
 # Exim test configuration 0900
 SERVER=
 # Exim test configuration 0900
 SERVER=

-X=
-Y=
-OPT=
+SRV=
+LIST=

 ALLOW=
 
 exim_path = EXIM_PATH
 ALLOW=
 
 exim_path = EXIM_PATH


@@ -13,11 +12,12 @@ log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 chunking_advertise_hosts = *
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 chunking_advertise_hosts = *

-tls_advertise_hosts = ${if eq {Y}{tls} {*}}
+tls_advertise_hosts = ${if eq {SRV}{tls} {*}}

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

+primary_hostname = testhost.test.ex

 domainlist local_domains = @ : test.ex
 
 acl_smtp_rcpt = check_recipient
 domainlist local_domains = @ : test.ex
 
 acl_smtp_rcpt = check_recipient


@@ -58,7 +58,7 @@ begin routers
 to_server:
   driver = accept
   condition =  ${if !eq {SERVER}{server}}
 to_server:
   driver = accept
   condition =  ${if !eq {SERVER}{server}}

-  transport =  remote_smtp${if eq {X}{dkim} {_dkim}}
+  transport =  remote_smtp${if eq {OPT}{dkim} {_dkim}}

   errors_to =  ""
 
 fail_remote_domains:
   errors_to =  ""
 
 fail_remote_domains:


@@ -103,11 +103,13 @@ remote_smtp_dkim:
   command_timeout = 2s
   final_timeout = 2s
 
   command_timeout = 2s
   final_timeout = 2s
 

+.ifdef OPT

   dkim_domain =                test.ex
   dkim_selector =      sel
   dkim_private_key =   DIR/aux-fixed/dkim/dkim.private
 .ifndef HEADERS_MAXSIZE
   dkim_domain =                test.ex
   dkim_selector =      sel
   dkim_private_key =   DIR/aux-fixed/dkim/dkim.private
 .ifndef HEADERS_MAXSIZE

-  dkim_sign_headers =  OPT
+  dkim_sign_headers =  LIST
+.endif

 .endif
 
 # ----- Retry -----
 .endif
 
 # ----- Retry -----