From e2d21764f15276a7e349012e7b8a7960b4ecbdae Mon Sep 17 00:00:00 2001
From: cellarspoon <cellarspoon@riseup.net>
Date: Mon, 13 Dec 2021 10:32:06 +0100
Subject: [PATCH] fix: dont use turn user/pass

---
 .env.sample          | 2 --
 abra.sh              | 1 -
 compose.turn.yml     | 4 ----
 homeserver.yaml.tmpl | 4 ++--
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/.env.sample b/.env.sample
index 961c97b..fc6fe23 100644
--- a/.env.sample
+++ b/.env.sample
@@ -19,7 +19,5 @@ SYNAPSE_ADMIN_EMAIL=admin@example.com
 #COMPOSE_FILE="compose.yml:compose.turn.yml"
 #TURN_ENABLED=1
 #TURN_URI=
-#TURN_USERNAME=
 #TURN_ALLOW_GUESTS=true
 #SECRET_TURN_SHARED_SECRET_VERSION=v1
-#SECRET_TURN_PASSWORD_VERSION=v1
diff --git a/abra.sh b/abra.sh
index c69a704..bbf06f9 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,3 +1,2 @@
 export ENTRYPOINT_CONF_VERSION=v1
-export TURNSERVER_CONF_VERSION=v1
 export NGINX_CONFIG_VERSION=v1
diff --git a/compose.turn.yml b/compose.turn.yml
index e42eef9..e7defea 100644
--- a/compose.turn.yml
+++ b/compose.turn.yml
@@ -11,12 +11,8 @@ services:
       - TURN_ALLOW_GUESTS
       - TURN_ENABLED
       - TURN_URI
-      - TURN_USERNAME
 
 secrets:
   turn_shared_secret:
     external: true
     name: ${STACK_NAME}_turn_shared_secret_${SECRET_TURN_SHARED_SECRET_VERSION}
-  turn_password:
-    external: true
-    name: ${STACK_NAME}_turn_password_${SECRET_TURN_PASSWORD_VERSION}
diff --git a/homeserver.yaml.tmpl b/homeserver.yaml.tmpl
index 741cd01..ffc39e0 100644
--- a/homeserver.yaml.tmpl
+++ b/homeserver.yaml.tmpl
@@ -1136,8 +1136,8 @@ turn_shared_secret: "{{ secret "turn_shared_secret" }}"
 # The Username and password if the TURN server needs them and
 # does not use a token
 #
-turn_username: "{{ env "TURN_USERNAME" }}"
-turn_password: "{{ secret "turn_password" }}"
+#turn_username: "TURNSERVER_USERNAME"
+#turn_password: "TURNSERVER_PASSWORD"
 
 # How long generated TURN credentials last
 #