From 718f6e6ac7bd2432a98c63cc50124ee8dc62edc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Tue, 5 Mar 2024 22:54:50 +0100
Subject: [PATCH] Remove turn_allow_guest settings and use allow_guest_access
 instead

---
 conf/homeserver.yaml | 2 +-
 config_panel.toml    | 7 -------
 scripts/install      | 2 --
 scripts/upgrade      | 5 -----
 4 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/conf/homeserver.yaml b/conf/homeserver.yaml
index 7720a95..81dc75e 100644
--- a/conf/homeserver.yaml
+++ b/conf/homeserver.yaml
@@ -1203,7 +1203,7 @@ turn_user_lifetime: 1h
 # connect to arbitrary endpoints without having first signed up for a
 # valid account (e.g. by passing a CAPTCHA).
 #
-turn_allow_guests: __TURN_ALLOW_GUESTS__
+turn_allow_guests: __ALLOW_GUEST_ACCESS__
 
 
 ## Registration ##
diff --git a/config_panel.toml b/config_panel.toml
index 0d5dc7f..36a6847 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -222,10 +222,3 @@ services = ["matrix-__APP__"]
             ask = "Shared Secret for Registration"
             type = "string"
             help = "Allows registration of standard or admin accounts, even if Registration disabled."
-
-            [advanced.registration.turn_allow_guests]
-            ask = "Should guests be allowed to use the TURN server"
-            type = "boolean"
-            yes = "true"
-            no = "false"
-            help = "This defaults to True, otherwise VoIP will be unreliable for guests. However, it does introduce a slight security risk as it allows users to connect to arbitrary endpoints without having first signed up for a valid account (e.g. by passing a CAPTCHA)."
diff --git a/scripts/install b/scripts/install
index 2d6523d..3ceaeae 100644
--- a/scripts/install
+++ b/scripts/install
@@ -43,7 +43,6 @@ notif_for_new_users="true"
 enable_group_creation="true"
 push_include_content="true"
 enable_3pid_lookup=false
-turn_allow_guests=false
 
 if [ "$is_free_registration" -eq 0 ]
 then
@@ -90,7 +89,6 @@ ynh_app_setting_set --app=$app --key=notif_for_new_users --value=$notif_for_new_
 ynh_app_setting_set --app=$app --key=enable_group_creation --value=$enable_group_creation
 ynh_app_setting_set --app=$app --key=push_include_content --value=$push_include_content
 ynh_app_setting_set --app=$app --key=enable_registration --value=$enable_registration
-ynh_app_setting_set --app=$app --key=turn_allow_guests --value=$turn_allow_guests
 ynh_app_setting_set --app=$app --key=password_enabled --value=$password_enabled
 ynh_app_setting_set --app=$app --key=enable_3pid_lookup --value=$enable_3pid_lookup
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 05ddf56..e6c3ed9 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -173,11 +173,6 @@ then
     enable_3pid_lookup=false
     ynh_app_setting_set --app=$app --key=enable_3pid_lookup --value=$enable_3pid_lookup
 fi
-if [ -z "${turn_allow_guests:-}" ]
-then
-    turn_allow_guests=false
-    ynh_app_setting_set --app=$app --key=turn_allow_guests --value=$turn_allow_guests
-fi
 
 
 if [ -z "${enable_registration:-}" ]