From db2739a4749ea49bc90f459eed2e7815671de60c Mon Sep 17 00:00:00 2001 From: moparisthebest Date: Tue, 22 Feb 2022 23:12:37 -0500 Subject: [PATCH] WebSocket host-meta tests use wildcard cert, revert after complete TLS name validation is implemented --- integration/23-s2s-websocket-host-meta/xmpp-proxy1.toml | 4 ++-- integration/23-s2s-websocket-host-meta/xmpp-proxy2.toml | 4 ++-- integration/24-s2s-websocket-host-meta-json/xmpp-proxy1.toml | 4 ++-- integration/24-s2s-websocket-host-meta-json/xmpp-proxy2.toml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/integration/23-s2s-websocket-host-meta/xmpp-proxy1.toml b/integration/23-s2s-websocket-host-meta/xmpp-proxy1.toml index ff8f87e..82e084b 100644 --- a/integration/23-s2s-websocket-host-meta/xmpp-proxy1.toml +++ b/integration/23-s2s-websocket-host-meta/xmpp-proxy1.toml @@ -28,8 +28,8 @@ max_stanza_size_bytes = 262_144 # TLS key/certificate valid for all your XMPP domains, PEM format # included systemd unit can only read files from /etc/xmpp-proxy/ so put them in there -tls_key = "/etc/prosody/certs/xp1.example.org.key" -tls_cert = "/etc/prosody/certs/xp1.example.org.crt" +tls_key = "/etc/prosody/certs/wildcard.key" +tls_cert = "/etc/prosody/certs/wildcard.crt" # configure logging, defaults are commented # can also set env variables XMPP_PROXY_LOG_LEVEL and/or XMPP_PROXY_LOG_STYLE, but values in this file override them diff --git a/integration/23-s2s-websocket-host-meta/xmpp-proxy2.toml b/integration/23-s2s-websocket-host-meta/xmpp-proxy2.toml index 356c355..a522b22 100644 --- a/integration/23-s2s-websocket-host-meta/xmpp-proxy2.toml +++ b/integration/23-s2s-websocket-host-meta/xmpp-proxy2.toml @@ -28,8 +28,8 @@ max_stanza_size_bytes = 262_144 # TLS key/certificate valid for all your XMPP domains, PEM format # included systemd unit can only read files from /etc/xmpp-proxy/ so put them in there -tls_key = "/etc/prosody/certs/xp2.example.org.key" -tls_cert = "/etc/prosody/certs/xp2.example.org.crt" +tls_key = "/etc/prosody/certs/wildcard.key" +tls_cert = "/etc/prosody/certs/wildcard.crt" # configure logging, defaults are commented # can also set env variables XMPP_PROXY_LOG_LEVEL and/or XMPP_PROXY_LOG_STYLE, but values in this file override them diff --git a/integration/24-s2s-websocket-host-meta-json/xmpp-proxy1.toml b/integration/24-s2s-websocket-host-meta-json/xmpp-proxy1.toml index ff8f87e..82e084b 100644 --- a/integration/24-s2s-websocket-host-meta-json/xmpp-proxy1.toml +++ b/integration/24-s2s-websocket-host-meta-json/xmpp-proxy1.toml @@ -28,8 +28,8 @@ max_stanza_size_bytes = 262_144 # TLS key/certificate valid for all your XMPP domains, PEM format # included systemd unit can only read files from /etc/xmpp-proxy/ so put them in there -tls_key = "/etc/prosody/certs/xp1.example.org.key" -tls_cert = "/etc/prosody/certs/xp1.example.org.crt" +tls_key = "/etc/prosody/certs/wildcard.key" +tls_cert = "/etc/prosody/certs/wildcard.crt" # configure logging, defaults are commented # can also set env variables XMPP_PROXY_LOG_LEVEL and/or XMPP_PROXY_LOG_STYLE, but values in this file override them diff --git a/integration/24-s2s-websocket-host-meta-json/xmpp-proxy2.toml b/integration/24-s2s-websocket-host-meta-json/xmpp-proxy2.toml index 356c355..a522b22 100644 --- a/integration/24-s2s-websocket-host-meta-json/xmpp-proxy2.toml +++ b/integration/24-s2s-websocket-host-meta-json/xmpp-proxy2.toml @@ -28,8 +28,8 @@ max_stanza_size_bytes = 262_144 # TLS key/certificate valid for all your XMPP domains, PEM format # included systemd unit can only read files from /etc/xmpp-proxy/ so put them in there -tls_key = "/etc/prosody/certs/xp2.example.org.key" -tls_cert = "/etc/prosody/certs/xp2.example.org.crt" +tls_key = "/etc/prosody/certs/wildcard.key" +tls_cert = "/etc/prosody/certs/wildcard.crt" # configure logging, defaults are commented # can also set env variables XMPP_PROXY_LOG_LEVEL and/or XMPP_PROXY_LOG_STYLE, but values in this file override them