From 6b78f73bdfd91bb2bba88582a30db61aa0c14c79 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Sat, 17 Dec 2022 17:45:27 +0000 Subject: [PATCH 01/13] add user domain selection administrador should now the domain configured for the users. --- manifest.json | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index a4e7f29..1e6458d 100644 --- a/manifest.json +++ b/manifest.json @@ -20,7 +20,8 @@ "email": "florent.git@zeteo.me" }, "requirements": { - "yunohost": ">= 4.1.0" + "yunohost": ">= 4.1.0", + "synapse": ">=1.0.0" }, "multi_instance": true, "services": [ @@ -32,15 +33,32 @@ "name": "synapsenumber", "type": "string", "ask": { - "en": "Choose the local synapse instance number to communicate with the Discord-Matrix bridge", - "fr": "Choisissez le numéro de l'instance synapse qui doit communiquer avec la passerelle Discord-Matrix" + "en": "Choose the local synapse instance number to communicate with the Discord-Matrix bridge.", + "fr": "Choisissez le numéro de l'instance synapse qui doit communiquer avec la passerelle Discord-Matrix." + "es": "Elije el numero de la instancia que se communicara con esta passarella Discord." }, "example": "2 (for instance synapse__2)", "help": { "en": "If you installed synapse only once time, then leave default value 1.", "fr": "Si vous n'avez installé qu'une fois synapse, gardez la valeur par défaut 1." + "es": "Si synapse esta installado una sola vez, deje el valor en 1. " }, "default": "1" + }, + { + "name": "user domain", + "type": "domain", + "ask": { + "en": "Choose the domain used by users on your serveur, in case of different from server domain.", + "fr": "Choisissez le domaine configuré pour vos utilisateurs, dans le cas ou il est différent du domaine du serveur." + "es": "Elije el dominio configurado para usuarios, en el caso de ser differente al dominio del servidor." + }, + "example": "domain.tld", + "help": { + "en": "If users have the same domain as server, please select the corresponding one.", + "fr": "Si les utilisateurs ont le meme domaine que domaine que le serveur, selectionnez celui qui correspond." + "es": "Si los usuarios cuentan con el mismo dominio que el servidor, seleciona el adecuado." + } } ] } From f2fc013580067660d2f067cb19243b19fa4591d4 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Sat, 17 Dec 2022 17:50:21 +0000 Subject: [PATCH 02/13] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 1e6458d..0c3e8d2 100644 --- a/manifest.json +++ b/manifest.json @@ -46,7 +46,7 @@ "default": "1" }, { - "name": "user domain", + "name": "user_domain", "type": "domain", "ask": { "en": "Choose the domain used by users on your serveur, in case of different from server domain.", From 3bad84ced04d89db22ce8e9e3d2f23554c0b3a53 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Sat, 17 Dec 2022 17:51:29 +0000 Subject: [PATCH 03/13] add user_domain variable --- scripts/backup | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/backup b/scripts/backup index 76e3ea0..8655c7c 100755 --- a/scripts/backup +++ b/scripts/backup @@ -29,6 +29,7 @@ app=$YNH_APP_INSTANCE_NAME final_path=$(ynh_app_setting_get --app=$app --key=final_path) domain=$(ynh_app_setting_get --app=$app --key=domain) +user_domain=$(ynh_app_setting_get --app=$app --key=user_domain) db_name=$(ynh_app_setting_get --app=$app --key=db_name) log_path=$(ynh_app_setting_get --app=$app --key=log_path) etc_path=$(ynh_app_setting_get --app=$app --key=etc_path) From d0a5f50f705226aa4f12af93921db9b806d79a1e Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Sat, 17 Dec 2022 17:57:18 +0000 Subject: [PATCH 04/13] add user_domain variable --- scripts/install | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/install b/scripts/install index 5ebea9e..b3175bc 100755 --- a/scripts/install +++ b/scripts/install @@ -45,6 +45,7 @@ fi server_name=$(ynh_app_setting_get --app $synapse_instance --key server_name) domain=$(ynh_app_setting_get --app $synapse_instance --key domain) +user_domain=$(ynh_app_setting_get --app=$app --key=user_domain) app_service_registration_path="/etc/matrix-$synapse_instance/app-service" log_path="/var/log/$app" base_config_path="$final_path/base.config.yaml" @@ -63,6 +64,7 @@ test ! -e "$final_path" || ynh_die --message="This path already contains a folde ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain +ynh_app_setting_set --app=$app --key=user_domain --value=$user_domain ynh_app_setting_set --app=$app --key=log_path --value=$log_path ynh_app_setting_set --app=$app --key=app_service_registration_path --value=$app_service_registration_path ynh_app_setting_set --app=$app --key=synapse_instance --value=$synapse_instance From 4c76d3b1e5fbaec611ac2049ffc3625177e2225e Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Sat, 17 Dec 2022 17:59:08 +0000 Subject: [PATCH 05/13] add user_domain variable --- scripts/remove | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/remove b/scripts/remove index 44f0e8f..eb5e716 100755 --- a/scripts/remove +++ b/scripts/remove @@ -17,6 +17,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) +user_domain=$(ynh_app_setting_get --app=$app --key=user_domain) port=$(ynh_app_setting_get --app=$app --key=port) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name From 84da0ab59f45dd1617f6cd3db983a5f2a9a5ecd7 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Sat, 17 Dec 2022 18:39:12 +0000 Subject: [PATCH 06/13] add user_domain variable --- scripts/restore | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/restore b/scripts/restore index eef7b48..9494bbf 100755 --- a/scripts/restore +++ b/scripts/restore @@ -28,6 +28,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) +user_domain=$(ynh_app_setting_get --app=$app --key=user_domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) From d0c91134ed34c298bca532ed789e6ae1574472d4 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Sat, 17 Dec 2022 18:40:32 +0000 Subject: [PATCH 07/13] add user_domain variable --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 0df0ba7..abc2c5d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -17,6 +17,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) +user_domain=$(ynh_app_setting_get --app=$app --key=user_domain) path_url=$(ynh_app_setting_get --app=$app --key=path) language=$(ynh_app_setting_get --app=$app --key=language) admin=$(ynh_app_setting_get --app=$app --key=admin) From 31062925e250dedca4d0af7a3d89bb8306b6568e Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Sat, 17 Dec 2022 19:07:59 +0000 Subject: [PATCH 08/13] update wit user_domain var --- conf/base.config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/base.config.yaml b/conf/base.config.yaml index 4ce0bef..b238165 100644 --- a/conf/base.config.yaml +++ b/conf/base.config.yaml @@ -11,7 +11,7 @@ bridge: bindAddress: localhost # Public domain of the homeserver - domain: __DOMAIN__ + domain: __USER_DOMAIN__ # Reachable URL of the Matrix homeserver homeserverUrl: https://__DOMAIN__ From e3e7a8b4da93cfcd642f3eadf9534ba422a3b485 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Sat, 17 Dec 2022 19:10:43 +0000 Subject: [PATCH 09/13] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index b3175bc..426372a 100755 --- a/scripts/install +++ b/scripts/install @@ -153,7 +153,7 @@ ynh_app_setting_set --app=$app --key=etc_path --value=$etc_path mkdir -p -m 750 "$etc_path" chown "$app:$app" "$etc_path" -any_account_of_domain="@.*:${domain//\./\\\.}" +any_account_of_domain="@.*:${user_domain//\./\\\.}" # TODO Add a way to override the config.yaml file ynh_add_config --template="base.config.yaml" --destination="$base_config_path" From f0d24a0192b9b2de81ca7555288ff149c204c389 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Sun, 18 Dec 2022 13:02:38 +0000 Subject: [PATCH 10/13] Update manifest.json --- manifest.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index 0c3e8d2..a153abb 100644 --- a/manifest.json +++ b/manifest.json @@ -34,13 +34,13 @@ "type": "string", "ask": { "en": "Choose the local synapse instance number to communicate with the Discord-Matrix bridge.", - "fr": "Choisissez le numéro de l'instance synapse qui doit communiquer avec la passerelle Discord-Matrix." + "fr": "Choisissez le numéro de l'instance synapse qui doit communiquer avec la passerelle Discord-Matrix.", "es": "Elije el numero de la instancia que se communicara con esta passarella Discord." }, "example": "2 (for instance synapse__2)", "help": { "en": "If you installed synapse only once time, then leave default value 1.", - "fr": "Si vous n'avez installé qu'une fois synapse, gardez la valeur par défaut 1." + "fr": "Si vous n'avez installé qu'une fois synapse, gardez la valeur par défaut 1.", "es": "Si synapse esta installado una sola vez, deje el valor en 1. " }, "default": "1" @@ -50,13 +50,13 @@ "type": "domain", "ask": { "en": "Choose the domain used by users on your serveur, in case of different from server domain.", - "fr": "Choisissez le domaine configuré pour vos utilisateurs, dans le cas ou il est différent du domaine du serveur." + "fr": "Choisissez le domaine configuré pour vos utilisateurs, dans le cas ou il est différent du domaine du serveur.", "es": "Elije el dominio configurado para usuarios, en el caso de ser differente al dominio del servidor." }, "example": "domain.tld", "help": { "en": "If users have the same domain as server, please select the corresponding one.", - "fr": "Si les utilisateurs ont le meme domaine que domaine que le serveur, selectionnez celui qui correspond." + "fr": "Si les utilisateurs ont le meme domaine que domaine que le serveur, selectionnez celui qui correspond.", "es": "Si los usuarios cuentan con el mismo dominio que el servidor, seleciona el adecuado." } } From 8d906ae53d852b6d662fb0cc522e6e31e4a236c3 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Sun, 18 Dec 2022 13:13:35 +0000 Subject: [PATCH 11/13] get userdomain value from synapse --- manifest.json | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/manifest.json b/manifest.json index a153abb..06ebe43 100644 --- a/manifest.json +++ b/manifest.json @@ -44,21 +44,6 @@ "es": "Si synapse esta installado una sola vez, deje el valor en 1. " }, "default": "1" - }, - { - "name": "user_domain", - "type": "domain", - "ask": { - "en": "Choose the domain used by users on your serveur, in case of different from server domain.", - "fr": "Choisissez le domaine configuré pour vos utilisateurs, dans le cas ou il est différent du domaine du serveur.", - "es": "Elije el dominio configurado para usuarios, en el caso de ser differente al dominio del servidor." - }, - "example": "domain.tld", - "help": { - "en": "If users have the same domain as server, please select the corresponding one.", - "fr": "Si les utilisateurs ont le meme domaine que domaine que le serveur, selectionnez celui qui correspond.", - "es": "Si los usuarios cuentan con el mismo dominio que el servidor, seleciona el adecuado." - } } ] } From f1cbd1392f391ad52ec0bdf2ce4c6d18dc41b87f Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Sun, 18 Dec 2022 13:20:58 +0000 Subject: [PATCH 12/13] set userdomain to domain if not present --- scripts/upgrade | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index abc2c5d..9ae25e1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,6 +33,11 @@ user_config_path="$etc_path/user.config.yaml" pip_path="$final_path/.pip" app_service_registration_path=$(ynh_app_setting_get --app=$app --key=app_service_registration_path) +if [ -z "$user_domain" ]; then + user_domain=$domain + ynh_app_setting_set --app=$app --key=user_domain --value=$domain +fi + #================================================= # CHECK VERSION #================================================= From 738c8d21ad8d46df8e7a12b3347506254d30524c Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Sun, 18 Dec 2022 13:25:54 +0000 Subject: [PATCH 13/13] get userdomain value from synapse --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 426372a..df240cb 100755 --- a/scripts/install +++ b/scripts/install @@ -45,7 +45,7 @@ fi server_name=$(ynh_app_setting_get --app $synapse_instance --key server_name) domain=$(ynh_app_setting_get --app $synapse_instance --key domain) -user_domain=$(ynh_app_setting_get --app=$app --key=user_domain) +user_domain=$(ynh_app_setting_get --app=$synapse_instance --key=server_name) app_service_registration_path="/etc/matrix-$synapse_instance/app-service" log_path="/var/log/$app" base_config_path="$final_path/base.config.yaml"