From a9b28b54d5e2ca6f66720056bdc4d413e1ba9da9 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Tue, 7 Apr 2020 23:08:52 -0700 Subject: [PATCH 1/2] Fix missing config update copy() for tls items. --- mautrix_telegram/config.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mautrix_telegram/config.py b/mautrix_telegram/config.py index 904f3a43..d9a24a2f 100644 --- a/mautrix_telegram/config.py +++ b/mautrix_telegram/config.py @@ -57,6 +57,9 @@ class Config(BaseBridgeConfig): base["appservice.address"] = f"{protocol}://{hostname}:{port}" else: copy("appservice.address") + + copy("appservice.tls_cert") + copy("appservice.tls_key") copy("appservice.hostname") copy("appservice.port") copy("appservice.max_body_size") From 2a0d44acc5ee5501cf956f1bf5e6a48b4d64d7d8 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Wed, 8 Apr 2020 00:56:52 -0700 Subject: [PATCH 2/2] Ensure config.yaml update order preservation by including tls items in example-conf.yaml --- mautrix_telegram/example-config.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mautrix_telegram/example-config.yaml b/mautrix_telegram/example-config.yaml index 794f6d6e..70bc1111 100644 --- a/mautrix_telegram/example-config.yaml +++ b/mautrix_telegram/example-config.yaml @@ -13,6 +13,9 @@ homeserver: appservice: # The address that the homeserver can use to connect to this appservice. address: http://localhost:29317 + # When using https:// the TLS certificate and key files for the address. + tls_cert: false + tls_key: false # The hostname and port where this appservice should listen. hostname: 0.0.0.0