From 63a2c6cce5f01cfca8295a2ea5ad7f639bc257b8 Mon Sep 17 00:00:00 2001
From: Torsten Flammiger <git@netfg.net>
Date: Fri, 4 Feb 2022 19:11:29 +0100
Subject: [PATCH 1/2] Add new TURN Readme and reference it from DEPLOY.md

---
 DEPLOY.md | 14 ++++++++++++++
 TURN.md   | 25 +++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 TURN.md

diff --git a/DEPLOY.md b/DEPLOY.md
index d9f91e03..4a0d0ab5 100644
--- a/DEPLOY.md
+++ b/DEPLOY.md
@@ -241,3 +241,17 @@ $ curl https://your.server.name:8448/_matrix/client/versions
 ```
 
 If you want to set up an appservice, take a look at the [Appservice Guide](APPSERVICES.md).
+
+# What's next?
+
+## Audio/Video calls
+
+For Audio/Video call functionality see the [TURN Guide](TURN.md).
+As of 2022, Clients known to support a/v calls are
+
+* Element/Android
+* SchildiChat
+
+Clients known to not support a/v calls are
+
+* FluffyChat
diff --git a/TURN.md b/TURN.md
new file mode 100644
index 00000000..ed962955
--- /dev/null
+++ b/TURN.md
@@ -0,0 +1,25 @@
+# Setting up TURN/STURN
+
+## General instructions
+
+* It is assumed you have a [Coturn server](https://github.com/coturn/coturn) up and running. See [Synapse reference implementation](https://github.com/matrix-org/synapse/blob/develop/docs/turn-howto.md).
+
+## Edit/Add a few settings to your existing conduit.toml
+
+```
+# Refer to your Coturn settings. 
+# `server.name` has to match the REALM setting of your Coturn as well as `transport`.
+turn_uris = ["turn:server.name?transport=udp", "turn:server.name?transport=tcp"]
+
+# static-auth-secret of your turnserver
+turn_secret = "ADD SECRET HERE"
+
+# 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`!
+#turn_username = ""
+#turn_password = ""
+```
+
+## Apply settings
+
+Restart Conduit.
\ No newline at end of file

From f110b5710a182192231d5ae40f8374bb5dda332f Mon Sep 17 00:00:00 2001
From: Torsten Flammiger <git@netfg.net>
Date: Fri, 4 Feb 2022 21:11:50 +0100
Subject: [PATCH 2/2] Move appservice howto into whats-next; again, rename
 placeholder TURN url

---
 DEPLOY.md | 5 ++++-
 TURN.md   | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/DEPLOY.md b/DEPLOY.md
index 8259b3f0..eecf5136 100644
--- a/DEPLOY.md
+++ b/DEPLOY.md
@@ -245,10 +245,13 @@ $ curl https://your.server.name:8448/_matrix/client/versions
 ```
 
 - To check if your server can talk with other homeservers, you can use the [Matrix Federation Tester](https://federationtester.matrix.org/)
-- If you want to set up an appservice, take a look at the [Appservice Guide](APPSERVICES.md).
 
 # What's next?
 
 ## Audio/Video calls
 
 For Audio/Video call functionality see the [TURN Guide](TURN.md).
+
+## Appservices
+
+If you want to set up an appservice, take a look at the [Appservice Guide](APPSERVICES.md).
diff --git a/TURN.md b/TURN.md
index ed962955..63c1e99f 100644
--- a/TURN.md
+++ b/TURN.md
@@ -8,8 +8,8 @@
 
 ```
 # Refer to your Coturn settings. 
-# `server.name` has to match the REALM setting of your Coturn as well as `transport`.
-turn_uris = ["turn:server.name?transport=udp", "turn:server.name?transport=tcp"]
+# `your.turn.url` has to match the REALM setting of your Coturn as well as `transport`.
+turn_uris = ["turn:your.turn.url?transport=udp", "turn:your.turn.url?transport=tcp"]
 
 # static-auth-secret of your turnserver
 turn_secret = "ADD SECRET HERE"