Merge branch 'master' into bye-bye-nginx-proxy

group_vars/matrix_servers

@@ -4889,6 +4889,29 @@ matrix_conduit_enabled: "{{ matrix_homeserver_implementation == 'conduit' }}"
 
 matrix_conduit_container_network: "{{ matrix_homeserver_container_network }}"
 
+# Even if TURN doesn't support TLS (it does by default),
+# it doesn't hurt to try a secure connection anyway.
+#
+# When Let's Encrypt certificates are used (the default case),
+# we don't enable `turns` endpoints, because WebRTC in Element can't talk to them.
+# Learn more here: https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1145
+matrix_conduit_turn_uris: |
+  {{
+    []
+    +
+    [
+      'turns:' + matrix_server_fqn_matrix + '?transport=udp',
+      'turns:' + matrix_server_fqn_matrix + '?transport=tcp',
+    ] if matrix_coturn_enabled and matrix_coturn_tls_enabled and matrix_playbook_ssl_retrieval_method != 'lets-encrypt' else []
+    +
+    [
+      'turn:' + matrix_server_fqn_matrix + '?transport=udp',
+      'turn:' + matrix_server_fqn_matrix + '?transport=tcp',
+    ] if matrix_coturn_enabled else []
+  }}
+
+matrix_conduit_turn_secret: "{{ matrix_coturn_turn_static_auth_secret if matrix_coturn_enabled else '' }}"
+
 ######################################################################
 #
 # /matrix-conduit

roles/custom/matrix-bridge-mautrix-signal/templates/config.yaml.j2

@@ -58,7 +58,7 @@ appservice:
     # Appservice bot details.
     bot:
         # Username of the appservice bot.
-        username: signalbot
+        username: {{ matrix_mautrix_signal_appservice_bot_username | to_json }}
         # Display name and avatar for bot. Set to "remove" to remove display name/avatar, leave empty
         # to leave display name/avatar as-is.
         displayname: signal bridge bot

roles/custom/matrix-conduit/defaults/main.yml

@@ -1,5 +1,6 @@
 ---
 # Conduit is a simple, fast and reliable chat server powered by Matrix
+# Project source code URL: https://gitlab.com/famedly/conduit
 # See: https://conduit.rs
 
 matrix_conduit_enabled: true
@@ -66,3 +67,10 @@ matrix_conduit_trusted_servers:
 
 # How many requests Conduit sends to other servers at the same time
 matrix_conduit_max_concurrent_requests: 100
+
+# TURN integration.
+# See: https://gitlab.com/famedly/conduit/-/blob/next/TURN.md
+matrix_conduit_turn_uris: []
+matrix_conduit_turn_secret: ''
+matrix_conduit_turn_username: ''
+matrix_conduit_turn_password: ''

roles/custom/matrix-conduit/templates/conduit/conduit.toml.j2

@@ -53,3 +53,15 @@ log = "info,state_res=warn,rocket=off,_=off,sled=off"
 
 address = "0.0.0.0"
 
+turn_uris = {{ matrix_conduit_turn_uris | to_json }}
+
+{% if matrix_conduit_turn_secret != '' %}
+turn_secret = {{ matrix_conduit_turn_secret | to_json }}
+{% endif %}
+
+# If you have your TURN server configured to use a username and password
+# you can provide these information too. In this case comment out `turn_secret above`!
+{% if matrix_conduit_turn_username != '' or matrix_conduit_turn_password != '' %}
+turn_username = {{ matrix_conduit_turn_username | to_json }}
+turn_password = {{ matrix_conduit_turn_password | to_json }}
+{% endif %}