From 170268fff0743380fb1990367aaa4638712eaa3d Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 23 Aug 2023 17:19:56 +0200
Subject: [PATCH] fix confusion

---
 conf/conduit.toml     | 2 +-
 conf/server_name.conf | 5 -----
 config_panel.toml     | 6 +++---
 scripts/install       | 4 ++--
 4 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 conf/server_name.conf

diff --git a/conf/conduit.toml b/conf/conduit.toml
index e66518a..e1a4f62 100644
--- a/conf/conduit.toml
+++ b/conf/conduit.toml
@@ -31,7 +31,7 @@ max_request_size = 20_000_000 # in bytes
 # Enables registration. If set to false, no users can register on this server.
 allow_registration = __REGISTRATION__
 
-allow_federation = __DISABLE_FEDERATION__
+allow_federation = __FEDERATION__
 allow_check_for_updates = true
 
 # Server to get public keys from. You probably shouldn't change this
diff --git a/conf/server_name.conf b/conf/server_name.conf
deleted file mode 100644
index 81c3548..0000000
--- a/conf/server_name.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-location /.well-known/matrix/server {
-    return 200 '{"m.server": "__DOMAIN__:443"}';
-    add_header Content-Type application/json;
-    add_header Access-Control-Allow-Origin '*';
-}
diff --git a/config_panel.toml b/config_panel.toml
index 31324af..e22854a 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -13,10 +13,10 @@ name = "Conduit configuration"
         no = "false"
         bind = "allow_registration:/var/www/__APP__/conduit.toml"
 
-        [main.registration.disable_federation]
-        ask = "Disable Federation"
+        [main.registration.federation]
+        ask = "Allow Federation"
         type = "boolean"
         yes = "true"
         no = "false"
-        help = "Do not communicate with other homeservers of the Matrix Federation."
+        help = "Communicate with other homeservers of the Matrix Federation."
         bind = "allow_federation:/var/www/__APP__/conduit.toml"
diff --git a/scripts/install b/scripts/install
index e1225ba..a877838 100755
--- a/scripts/install
+++ b/scripts/install
@@ -15,7 +15,7 @@ source /usr/share/yunohost/helpers
 
 #server_name=$YNH_APP_ARG_SERVER_NAME
 registration=$YNH_APP_ARG_REGISTRATION
-disable_federation="true"
+federation="true"
 
 #=================================================
 # STORE SETTINGS FROM MANIFEST
@@ -23,7 +23,7 @@ disable_federation="true"
 
 #ynh_app_setting_set --app=$app --key=server_name --value=$server_name
 ynh_app_setting_set --app=$app --key=registration --value=$registration
-ynh_app_setting_set --app=$app --key=disable_federation --value=$disable_federation
+ynh_app_setting_set --app=$app --key=federation --value=$federation
 
 #=================================================
 # APP "BUILD" (DEPLOYING SOURCES, VENV, COMPILING ETC)