summaryrefslogtreecommitdiff
path: root/test/confs
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2017-09-12 17:49:58 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2017-09-12 20:01:30 +0100
commit9e70917d0aa5e51f584b2af69ce80df458ac5c79 (patch)
tree645d300626ee9099d60a7515a7d5f27225574a52 /test/confs
parentd73e45df63ef6602fa32bd3e196d20735a0b69b5 (diff)
DKIM: support multiple signing, by selector
Diffstat (limited to 'test/confs')
-rw-r--r--test/confs/45207
l---------test/confs/45241
2 files changed, 7 insertions, 1 deletions
diff --git a/test/confs/4520 b/test/confs/4520
index 449702855..5f4649846 100644
--- a/test/confs/4520
+++ b/test/confs/4520
@@ -12,6 +12,7 @@ primary_hostname = myhost.test.ex
acl_smtp_rcpt = accept
acl_smtp_dkim = accept logwrite = signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames
+DDIR=DIR/aux-fixed/dkim
# ----- Routers
@@ -42,7 +43,11 @@ send_to_server:
.else
dkim_selector = sel
.endif
- dkim_private_key = DIR/aux-fixed/dkim/dkim.private
+
+ dkim_private_key = ${if match {$dkim_selector}{^ses} {DDIR/dkim512.private} \
+ {${if match {$dkim_selector}{^sel} {DDIR/dkim.private} \
+ {}}}}
+
.ifndef HEADERS_MAXSIZE
dkim_sign_headers = OPT
.endif
diff --git a/test/confs/4524 b/test/confs/4524
new file mode 120000
index 000000000..072f5faf2
--- /dev/null
+++ b/test/confs/4524
@@ -0,0 +1 @@
+4520 \ No newline at end of file