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

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: ''