DKIM: rename variables for clarity

[users/jgh/exim.git] / test / confs / 4503

diff --git a/test/confs/4503 b/test/confs/4503
index e9f2d5d4784ea9ef203c4020e990c73a74d6043c..cbd82d8f5ba56c086990651bb85663a17172e526 100644 (file)
--- a/test/confs/4503
+++ b/test/confs/4503
@@ -1,21 +1,17 @@
 # Exim test configuration 4503
 
 SERVER=
+OPT=
+
+.include DIR/aux-var/std_conf_prefix
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
-log_selector = +outgoing_port
 acl_smtp_rcpt = accept
-acl_smtp_dkim = accept logwrite = signer: $dkim_cur_signer bits: $dkim_key_length
+acl_smtp_dkim = accept logwrite = signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames
+
 
 # ----- Routers
 
@@ -41,7 +37,14 @@ send_to_server:
   port = PORT_D
 
   dkim_domain =                test.ex
+.ifdef SELECTOR
+  dkim_selector =      SELECTOR
+.else
   dkim_selector =      sel
+.endif
   dkim_private_key =   DIR/aux-fixed/dkim/dkim.private
+.ifndef HEADERS_MAXSIZE
+  dkim_sign_headers =  OPT
+.endif
 
 # End