From 3a00c7a4f3e46eca29c486ef70a73de850cc91bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 31 Jul 2024 23:11:44 +0200 Subject: [PATCH] cleaning --- config_panel.toml | 18 ++++++------ scripts/upgrade | 74 ----------------------------------------------- 2 files changed, 9 insertions(+), 83 deletions(-) diff --git a/config_panel.toml b/config_panel.toml index ac24e5d..3d85f63 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -13,7 +13,7 @@ services = ["__APP__"] ask.fr = "Définir le MOTD" type = "string" help = "Set the MOTD message shown in Vikunja login page" - bind = "motd:/var/www/__APP__/config.yml" + bind = "motd:__INSTALL_DIR__/config.yml" [main.config.enable_registration] ask.en = "Enable registration" @@ -22,7 +22,7 @@ services = ["__APP__"] yes = "true" no = "false" help = "Whether to let new users registering themselves or not" - bind = "enableregistration:/var/www/__APP__/config.yml" + bind = "enableregistration:__INSTALL_DIR__/config.yml" [main.config.enable_linksharing] ask.en = "Enable links sharing" @@ -31,7 +31,7 @@ services = ["__APP__"] yes = "true" no = "false" help = "Enable sharing of lists via a link" - bind = "enablelinksharing:/var/www/__APP__/config.yml" + bind = "enablelinksharing:__INSTALL_DIR__/config.yml" [main.config.enable_taskattachments] ask.en = "Enable tasks attachments" @@ -40,7 +40,7 @@ services = ["__APP__"] yes = "true" no = "false" help = "Whether to enable task attachments or not" - bind = "enabletaskattachments:/var/www/__APP__/config.yml" + bind = "enabletaskattachments:__INSTALL_DIR__/config.yml" [main.config.enable_taskcomments] ask.en = "Enable task comments" @@ -49,7 +49,7 @@ services = ["__APP__"] yes = "true" no = "false" help = "Whether task comments should be enabled or not" - bind = "enabletaskcomments:/var/www/__APP__/config.yml" + bind = "enabletaskcomments:__INSTALL_DIR__/config.yml" [main.config.enable_emailreminders] ask.en = "Enable email reminders" @@ -58,7 +58,7 @@ services = ["__APP__"] yes = "true" no = "false" help = "If enabled, vikunja will send an email to everyone who is either assigned to a task or created it when a task reminder is due." - bind = "enableemailreminders:/var/www/__APP__/config.yml" + bind = "enableemailreminders:__INSTALL_DIR__/config.yml" [main.config.enable_userdeletion] ask.en = "Enable user deletion" @@ -67,19 +67,19 @@ services = ["__APP__"] yes = "true" no = "false" help = "If true, will allow users to request the complete deletion of their account. When using external authentication methods it may be required to coordinate with them in order to delete the account. This setting will not affect the cli commands for user deletion" - bind = "enableuserdeletion:/var/www/__APP__/config.yml" + bind = "enableuserdeletion:__INSTALL_DIR__/config.yml" [main.config.maxavatarsize] ask.en = "Max avatar size" ask.fr = "Taille maximum de l'avatar" type = "number" help = "The maximum size clients will be able to request for user avatars. If clients request a size bigger than this, it will be changed on the fly" - bind = "maxavatarsize:/var/www/__APP__/config.yml" + bind = "maxavatarsize:__INSTALL_DIR__/config.yml" [main.config.maxitemsperpage] ask.en = "Max items per page" ask.fr = "Nombre d'éléments maximum par page" type = "number" help = "The max number of items which can be returned per page" - bind = "maxitemsperpage:/var/www/__APP__/config.yml" + bind = "maxitemsperpage:__INSTALL_DIR__/config.yml" diff --git a/scripts/upgrade b/scripts/upgrade index 7ef219e..a07908b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,80 +21,6 @@ ynh_app_setting_set_default --key=maxavatarsize --value=1024 ynh_app_setting_set_default --key=maxitemsperpage --value=50 ynh_app_setting_set_default --key=language --value="en" - - - -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -# ynh_script_progression "Ensuring downward compatibility..." - -# # FIXMEhelpers2.1: maybe replace with: ynh_app_setting_set_default --key=set_motd --value="" -# if [ -z "${set_motd:-}" ]; then -# set_motd="" -# ynh_app_setting_set --key="set_motd" --value="$set_motd" -# fi - -# # FIXMEhelpers2.1: maybe replace with: ynh_app_setting_set_default --key=enable_registration --value="true" -# if [ -z "${enable_registration:-}" ]; then -# enable_registration="true" -# ynh_app_setting_set --key="enable_registration" --value="$enable_registration" -# fi - -# # FIXMEhelpers2.1: maybe replace with: ynh_app_setting_set_default --key=enable_linksharing --value="true" -# if [ -z "${enable_linksharing:-}" ]; then -# enable_linksharing="true" -# ynh_app_setting_set --key="enable_linksharing" --value="$enable_linksharing" -# fi - -# # FIXMEhelpers2.1: maybe replace with: ynh_app_setting_set_default --key=enable_taskattachments --value="true" -# if [ -z "${enable_taskattachments:-}" ]; then -# enable_taskattachments="true" -# ynh_app_setting_set --key="enable_taskattachments" --value="$enable_taskattachments" -# fi - -# # FIXMEhelpers2.1: maybe replace with: ynh_app_setting_set_default --key=enable_taskcomments --value="true" -# if [ -z "${enable_taskcomments:-}" ]; then -# enable_taskcomments="true" -# ynh_app_setting_set --key="enable_taskcomments" --value="$enable_taskcomments" -# fi - -# # FIXMEhelpers2.1: maybe replace with: ynh_app_setting_set_default --key=enable_emailreminders --value="true" -# if [ -z "${enable_emailreminders:-}" ]; then -# enable_emailreminders="true" -# ynh_app_setting_set --key="enable_emailreminders" --value="$enable_emailreminders" -# fi - -# # FIXMEhelpers2.1: maybe replace with: ynh_app_setting_set_default --key=enable_userdeletion --value="true" -# if [ -z "${enable_userdeletion:-}" ]; then -# enable_userdeletion="true" -# ynh_app_setting_set --key="enable_userdeletion" --value="$enable_userdeletion" -# fi - -# # FIXMEhelpers2.1: maybe replace with: ynh_app_setting_set_default --key=maxavatarsize --value=1024 -# if [ -z "${maxavatarsize:-}" ]; then -# maxavatarsize=1024 -# ynh_app_setting_set --key="maxavatarsize" --value="$maxavatarsize" -# fi - -# # FIXMEhelpers2.1: maybe replace with: ynh_app_setting_set_default --key=maxitemsperpage --value=50 -# if [ -z "${maxitemsperpage:-}" ]; then -# maxitemsperpage=50 -# ynh_app_setting_set --key="maxitemsperpage" --value="$maxitemsperpage" -# fi - -# # FIXMEhelpers2.1: maybe replace with: ynh_app_setting_set_default --key=language --value="en" -# if [ -z "${language:-}" ]; then -# language="en" -# ynh_app_setting_set --key="language" --value="$language" -# fi - -# if ynh_app_upgrading_from_version_before 0.23.0~ynh1; then -# mv "$backend_path/config.yml" "$install_dir/config.yml" -# ynh_safe_rm "$backend_path" -# ynh_app_setting_delete --key="backend_path" -# fi - #================================================= # STOP SYSTEMD SERVICE #=================================================