From 865da37a4ea5a8a0ede1b446980763a599710ebf Mon Sep 17 00:00:00 2001 From: Gredin 67 Date: Sun, 8 Jan 2023 21:50:52 +0100 Subject: [PATCH] missing bind --- config_panel.toml | 18 +++++++++--------- scripts/install | 4 ++-- scripts/upgrade | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config_panel.toml b/config_panel.toml index b411670..7200e34 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -20,7 +20,7 @@ services = ["__APP__"] type = "select" choices = ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL", "NOTSET"] help = "NOTSET means that all messages will be logged: https://docs.python.org/3.6/library/logging.config.html#configuration-file-format" - bind = ":__FINALPATH__/config.yaml" + bind = "root>level:__FINALPATH__/config.yaml" [appservice.bot] name = "Robot Settings" @@ -28,25 +28,25 @@ services = ["__APP__"] [appservice.bot.appserviceid] ask = "Unique ID of Appservice" type = "string" - bind = ":__FINALPATH__/config.yaml" + bind = "appservice>id:__FINALPATH__/config.yaml" [appservice.bot.botname] ask = "Username of the Appservice Bot" type = "string" help = "Sets bot username. Please keep in mind that the bot admin room for previous bot username will stop working so you may need to create a new one using the new username" - bind = ":__FINALPATH__/config.yaml" + bind = "appservice>bot_username:__FINALPATH__/config.yaml" [appservice.bot.displayname] ask = "Display Name for Bot" type = "string" help = "Set to 'remove' to remove display name, leave empty to leave display name as-is" - bind = ":__FINALPATH__/config.yaml" + bind = "appservice>bot_displayname:__FINALPATH__/config.yaml" [appservice.bot.avatar] ask = "Avatar for Bot" type = "string" help = "Set to 'remove' to remove avatar, leave empty to leave avatar as-is" - bind = ":__FINALPATH__/config.yaml" + bind = "appservice>bot_avatar:__FINALPATH__/config.yaml" [appservice.metrics] name = "Prometheus Metrics" @@ -56,9 +56,9 @@ services = ["__APP__"] type = "boolean" yes = "true" no = "false" - bind = ":__FINALPATH__/config.yaml" + bind = "metrics>enabled:__FINALPATH__/config.yaml" - [appservice.metrics.metrics_listen_port] + [appservice.metrics.listen_port] ask = "Port for the Metrics listener?" type = "string" help = "Default 8000." @@ -132,7 +132,7 @@ services = ["__APP__"] yes = "true" no = "false" help = "For the Bridge to work in group chat Rooms with End-to-End Encryption (e2ee) enabled." - bind = ":__FINALPATH__/config.yaml" + bind = "encryption>allow:__FINALPATH__/config.yaml" [bridge.portal_rooms.encryption_default] ask = "Force-enable Encryption in all Portal Rooms the Bridge creates?" @@ -140,7 +140,7 @@ services = ["__APP__"] yes = "true" no = "false" help = "This will cause the Bridge Bot to be in private chats for the Encryption to work properly." - bind = ":__FINALPATH__/config.yaml" + bind = "encryption>default:__FINALPATH__/config.yaml" [usermanagement] name = "Bridge Permissions" diff --git a/scripts/install b/scripts/install index 8b30e64..69a4698 100755 --- a/scripts/install +++ b/scripts/install @@ -61,7 +61,7 @@ displayname="Signal bridge bot" avatar="mxc://maunium.net/wPJgTQbZOtpBFmDNkiNEMDUp" ephemeral_events=false enable_metrics=false -metrics_listen_port=8000 +listen_port=8000 registration_enabled=true enable_disappearing_messages_in_groups=false username_template="sg_{userid}" @@ -75,7 +75,7 @@ ynh_app_setting_set --app=$app --key=displayname --value=$displayname ynh_app_setting_set --app=$app --key=avatar --value=$avatar ynh_app_setting_set --app=$app --key=ephemeral_events --value=$ephemeral_events ynh_app_setting_set --app=$app --key=enable_metrics --value=$enable_metrics -ynh_app_setting_set --app=$app --key=metrics_listen_port --value=$metrics_listen_port +ynh_app_setting_set --app=$app --key=listen_port --value=$listen_port ynh_app_setting_set --app=$app --key=registration_enabled --value=$registration_enabled ynh_app_setting_set --app=$app --key=enable_disappearing_messages_in_groups --value=$enable_disappearing_messages_in_groups ynh_app_setting_set --app=$app --key=username_template --value=$username_template diff --git a/scripts/upgrade b/scripts/upgrade index 0bb2dc6..95e5040 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -42,7 +42,7 @@ displayname=$(ynh_app_setting_get --app=$app --key=displayname) avatar=$(ynh_app_setting_get --app=$avatar --key=avatar) ephemeral_events=$(ynh_app_setting_get --app=$app --key=ephemeral_events) enable_metrics=$(ynh_app_setting_get --app=$app --key=enable_metrics) -metrics_listen_port=$(ynh_app_setting_get --app=$app --key=metrics_listen_port) +listen_port=$(ynh_app_setting_get --app=$app --key=listen_port) registration_enabled=$(ynh_app_setting_get --app=$app --key=registration_enabled) enable_disappearing_messages_in_groups=$(ynh_app_setting_get --app=$app --key=enable_disappearing_messages_in_groups) username_template=$(ynh_app_setting_get --app=$app --key=username_template) @@ -112,10 +112,10 @@ then ynh_app_setting_set --app=$app --key=enable_metrics --value=$enable_metrics fi -if [ -z "$metrics_listen_port" ] +if [ -z "$listen_port" ] then - metrics_listen_port=8000 - ynh_app_setting_set --app=$app --key=metrics_listen_port --value=$metrics_listen_port + listen_port=8000 + ynh_app_setting_set --app=$app --key=listen_port --value=$listen_port fi if [ -z "$registration_enabled" ]