From 2ea88c465ccf8fc9dac714dd9b55c8019e90daee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= Date: Mon, 1 Nov 2021 19:26:49 +0100 Subject: [PATCH] File transfer CI: use rustls-style tls config for aquatic_ws --- .github/actions/test-transfer/entrypoint.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/actions/test-transfer/entrypoint.sh b/.github/actions/test-transfer/entrypoint.sh index d6a7eea..2fe9db2 100755 --- a/.github/actions/test-transfer/entrypoint.sh +++ b/.github/actions/test-transfer/entrypoint.sh @@ -55,8 +55,6 @@ openssl pkcs8 -in key.pem -topk8 -nocrypt -out key.pk8 # rustls $SUDO cp cert.crt /usr/local/share/ca-certificates/snakeoil.crt $SUDO update-ca-certificates -openssl pkcs12 -export -passout "pass:p" -out identity.pfx -inkey key.pem -in cert.crt - # Build and start tracker cargo build --bin aquatic @@ -85,9 +83,8 @@ echo "log_level = 'trace' [network] address = '127.0.0.1:3002' -use_tls = true -tls_pkcs12_path = './identity.pfx' -tls_pkcs12_password = 'p' +tls_certificate_path = './cert.crt' +tls_private_key_path = './key.pk8' " > ws.toml ./target/debug/aquatic ws -c ws.toml > "$HOME/wss.log" 2>&1 &