summaryrefslogtreecommitdiff
path: root/test/confs
diff options
context:
space:
mode:
Diffstat (limited to 'test/confs')
-rw-r--r--test/confs/20243
-rw-r--r--test/confs/20269
-rw-r--r--test/confs/34654
3 files changed, 13 insertions, 3 deletions
diff --git a/test/confs/2024 b/test/confs/2024
index a677c4c86..c59e975de 100644
--- a/test/confs/2024
+++ b/test/confs/2024
@@ -24,6 +24,7 @@ tls_certificate = CERT
tls_privatekey = CERT
tls_verify_hosts = HOSTIPV4
-tls_verify_certificates = TVC
+#tls_verify_certificates = TVC
+tls_verify_certificates = CERT
# End
diff --git a/test/confs/2026 b/test/confs/2026
index 4185e0b79..d70c5a2db 100644
--- a/test/confs/2026
+++ b/test/confs/2026
@@ -5,7 +5,11 @@ host_lookup_order = bydns
primary_hostname = myhost.test.ex
rfc1413_query_timeout = 0s
spool_directory = DIR/spool
+.ifdef SERVER
log_file_path = DIR/spool/log/%slog
+.else
+log_file_path = DIR/spool/log/%D-%slog
+.endif
gecos_pattern = ""
gecos_name = CALLER_NAME
@@ -14,6 +18,7 @@ gecos_name = CALLER_NAME
acl_smtp_rcpt = check_rcpt
log_selector = +tls_peerdn
+
tls_advertise_hosts = HOSTIPV4
tls_certificate = DIR/aux-fixed/cert1
tls_privatekey = DIR/aux-fixed/cert1
@@ -25,12 +30,12 @@ begin acl
check_rcpt:
accept local_parts = userx
+ control = queue_only
defer local_parts = usery
hosts = 127.0.0.1
- accept
-
+ accept control = queue_only
# ----- Routers -----
diff --git a/test/confs/3465 b/test/confs/3465
index 161fff526..83592a678 100644
--- a/test/confs/3465
+++ b/test/confs/3465
@@ -70,5 +70,9 @@ t1:
hosts_require_auth = *
allow_localhost
+ # These can be made visible by adding "-d-all+deliver+transport+tls" to the script 1st queuerun
+ headers_add = X-tls-cipher: <$tls_cipher>
+ headers_add = X-tls-out-cipher: <$tls_out_cipher>
+
# End