From fe14938ee65219ba4005321b691b2ce435e9dbc9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 1 Nov 2020 14:31:10 +0100 Subject: [PATCH] Small fixes --- CHANGELOG.md | 3 +++ config_panel.toml | 10 +++++----- scripts/_common.sh | 2 +- scripts/backup | 2 ++ scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 4 ++-- 7 files changed, 15 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0298450..80f6cb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,11 @@ Changelog ========= ## [0.12.1~ynh1](https://github.com/YunoHost-Apps/lutim_ynh/pull/46) - 2020-10-18 + +#### Changed * [Update to Lutim 0.12.1](https://github.com/YunoHost-Apps/lutim_ynh/pull/52) + ## [0.11.6~ynh4](https://github.com/YunoHost-Apps/lutim_ynh/pull/46) - 2020-04-25 #### Added diff --git a/config_panel.toml b/config_panel.toml index 2dc90df..b24d3b3 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -8,7 +8,7 @@ name = "Lutim configuration" name = "Lutim configuration" [main.configuration.always_encrypt] - ask = "Force the encryption of images ?" + ask = "Force the encryption of images?" type = "boolean" default = true @@ -28,19 +28,19 @@ name = "Lutim configuration" name = "Overwriting config files" [main.overwrite_files.overwrite_settings] - ask = "Overwrite the config file lutim.conf ?" + ask = "Overwrite the config file lutim.conf?" type = "boolean" default = true help = "If the file is overwritten, a backup will be created." [main.overwrite_files.overwrite_nginx] - ask = "Overwrite the nginx config file ?" + ask = "Overwrite the nginx config file?" type = "boolean" default = true help = "If the file is overwritten, a backup will be created." [main.overwrite_files.overwrite_systemd] - ask = "Overwrite the systemd config file ?" + ask = "Overwrite the systemd config file?" type = "boolean" default = true help = "If the file is overwritten, a backup will be created." @@ -49,7 +49,7 @@ name = "Lutim configuration" name = "Global configuration" [main.global_config.email_type] - ask = "Send HTML email to admin ?" + ask = "Send HTML email to admin?" type = "boolean" default = true help = "Allow app scripts to send HTML mails instead of plain text." diff --git a/scripts/_common.sh b/scripts/_common.sh index eadaee3..85f7a0c 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -app_depencencies="carton perlmagick libpq-dev shared-mime-info" +pkg_depencencies="carton perlmagick libpq-dev shared-mime-info" #================================================= # BACKUP diff --git a/scripts/backup b/scripts/backup index 68dd31c..f2d1f9e 100644 --- a/scripts/backup +++ b/scripts/backup @@ -44,6 +44,8 @@ ynh_backup --src_path="$final_path" ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" +#================================================= +# SPECIFIC BACKUP #================================================= # BACKUP LOGROTATE #================================================= diff --git a/scripts/install b/scripts/install index dc2333e..5011931 100644 --- a/scripts/install +++ b/scripts/install @@ -81,7 +81,7 @@ ynh_setup_source --dest_dir="$final_path" #================================================= ynh_script_progression --message="Installing dependencies..." --weight=60 -ynh_install_app_dependencies $app_depencencies +ynh_install_app_dependencies $pkg_depencencies #================================================= # NGINX CONFIGURATION diff --git a/scripts/restore b/scripts/restore index 829679a..1955f5b 100644 --- a/scripts/restore +++ b/scripts/restore @@ -86,7 +86,7 @@ chown -R $app: $final_path #================================================= ynh_script_progression --message="Reinstalling dependencies..." --weight=60 -ynh_install_app_dependencies $app_depencencies +ynh_install_app_dependencies $pkg_depencencies #================================================= # ADVERTISE SERVICE IN ADMIN PANEL diff --git a/scripts/upgrade b/scripts/upgrade index 2674aea..ea7c2f1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -182,7 +182,7 @@ fi #================================================= ynh_script_progression --message="Upgrading dependencies..." --weight=9 -ynh_install_app_dependencies $app_depencencies +ynh_install_app_dependencies $pkg_depencencies #================================================= # NGINX CONFIGURATION @@ -272,7 +272,7 @@ ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_fil if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Upgrading Lutim with carton..." --weight=4 + ynh_script_progression --message="Upgrading Lutim with Carton..." --weight=4 (cd $final_path carton install 2>&1 | tee -a "/var/log/$app/setup_carton.log") fi