From 984578dbf8d7d9f07c7e8b14dacd19a9c4db9e21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nathana=C3=ABl=20HANNEBERT?= Date: Wed, 14 Dec 2022 22:30:47 +0100 Subject: [PATCH] change everything, based on https://github.com/YunoHost-Apps/mautrix_whatsapp_ynh/pull/74 --- config_panel.toml | 23 +++++++++++------------ scripts/config | 11 ++++------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/config_panel.toml b/config_panel.toml index 004a554..76ced17 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -1,16 +1,15 @@ version = "1.0" -[bind] -name = "Mautrix Signal configuration" +[encryption] +name = "Encryption" +services = ["__APP__"] + [encryption.config] + name = "Encryption settings" - [bind.encryption] - name = "Manage encryption" - - [bind.encryption.encryption] - ask = "Do you want to allow the use of encrypted room with Mautrix Signal Bridge? " + [encryption.config.encryption] + ask = "Enable encryption" type = "boolean" - help = "Allow encryption, work in group chat rooms with e2ee enabled. Values possible are 'true' or 'false'." - bind = ":__FINALPATH__//config.yaml" - - -# TODO: Add toggle for enabling and enforcing encyption \ No newline at end of file + yes = "true" + no = "false" + help = "Enables end to bridge encryption" + bind = "encryption>allow:__FINALPATH__/config.yaml" diff --git a/scripts/config b/scripts/config index fde7445..45faa2f 100644 --- a/scripts/config +++ b/scripts/config @@ -15,8 +15,10 @@ ynh_abort_if_errors # RETRIEVE ARGUMENTS #================================================= -encryption_allowed=$(ynh_app_setting_get --app=$app --key=encryption_allowed) - +function get__encryption { + encryption=$(ynh_app_setting_get --app $app --key encryption) + echo "'${encryption}'" +} #================================================= # SPECIFIC GETTERS FOR TOML SHORT KEY #================================================= @@ -32,9 +34,4 @@ encryption_allowed=$(ynh_app_setting_get --app=$app --key=encryption_allowed) # GENERIC FINALIZATION #================================================= -ynh_app_config_apply() { - _ynh_app_config_apply - # TODO: regen the config at --destination="$final_path/config.yaml" -} - ynh_app_config_run $1