From 6e155c9a6e03b8df7e3f17424280b3484045cb46 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 13 Feb 2021 19:19:24 +0100 Subject: [PATCH] Fix linter warnings --- conf/nginx.conf | 2 +- scripts/_common.sh | 20 ++++++++++++++++++++ scripts/backup | 11 ++++++----- scripts/install | 3 ++- scripts/remove | 1 + scripts/restore | 4 +++- scripts/upgrade | 21 ++++++++++++++------- 7 files changed, 47 insertions(+), 15 deletions(-) create mode 100644 scripts/_common.sh diff --git a/conf/nginx.conf b/conf/nginx.conf index a86f6cb..73d19a9 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -14,7 +14,7 @@ location __PATH__/ { access_log off; # Allow shellinabox to use 'eval' without blocking the execution. But keep a warning. - more_set_headers Content-Security-Policy-Report-Only "script-src https: 'unsafe-eval'"; + more_set_headers "Content-Security-Policy-Report-Only script-src https: 'unsafe-eval'"; more_clear_input_headers 'Accept-Encoding'; diff --git a/scripts/_common.sh b/scripts/_common.sh new file mode 100644 index 0000000..54e78b3 --- /dev/null +++ b/scripts/_common.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +#================================================= +# COMMON VARIABLES +#================================================= + +# dependencies used by the app +pkg_dependencies="shellinabox" + +#================================================= +# PERSONAL HELPERS +#================================================= + +#================================================= +# EXPERIMENTAL HELPERS +#================================================= + +#================================================= +# FUTURE OFFICIAL HELPERS +#================================================= diff --git a/scripts/backup b/scripts/backup index a58fb6d..0202264 100644 --- a/scripts/backup +++ b/scripts/backup @@ -18,18 +18,20 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." +ynh_print_info --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) #================================================= -# STANDARD BACKUP STEPS +# DECLARE DATA AND CONF FILES TO BACKUP +#================================================= +ynh_print_info --message="Declaring files to be backed up..." + #================================================= # BACKUP THE APP MAIN DIR #================================================= -ynh_script_progression --message="Backing up the main app directory..." ynh_backup --src_path="/etc/shellinabox" ynh_backup --src_path="/etc/default/shellinabox" @@ -37,7 +39,6 @@ ynh_backup --src_path="/etc/default/shellinabox" #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Backing up nginx web server configuration..." ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" @@ -45,4 +46,4 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" # END OF SCRIPT #================================================= -ynh_script_progression --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." --last +ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/install b/scripts/install index e5de7ee..85ce212 100644 --- a/scripts/install +++ b/scripts/install @@ -6,6 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= +source _common.sh source /usr/share/yunohost/helpers #================================================= @@ -57,7 +58,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port ynh_script_progression --message="Installing shellinabox..." --weight=7 ynh_package_update -ynh_package_install shellinabox +ynh_install_app_dependencies $pkg_dependencies #================================================= # NGINX CONFIGURATION diff --git a/scripts/remove b/scripts/remove index 56374d6..cebc0f9 100644 --- a/scripts/remove +++ b/scripts/remove @@ -6,6 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= +source _common.sh source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/restore b/scripts/restore index 2924c9a..7de0667 100644 --- a/scripts/restore +++ b/scripts/restore @@ -6,6 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= +source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers #================================================= @@ -48,7 +49,8 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_script_progression --message="Installing shellinabox..." --weight=7 ynh_package_update -ynh_package_install shellinabox + +ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE THE APP MAIN DIR diff --git a/scripts/upgrade b/scripts/upgrade index 71f210a..ab999d1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -6,6 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= +source _common.sh source /usr/share/yunohost/helpers #================================================= @@ -44,13 +45,6 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# CHECK THE PATH -#================================================= - -# Normalize the URL path syntax -path_url=$(ynh_normalize_url_path --path_url=$path_url) - #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -61,6 +55,13 @@ ynh_script_progression --message="Upgrading nginx web server configuration..." - # Create a dedicated nginx config ynh_add_nginx_config +#================================================= +# UPGRADE DEPENDENCIES +#================================================= +ynh_script_progression --message="Upgrading dependencies..." --weight=1 + +ynh_install_app_dependencies $pkg_dependencies + #================================================= # CONFIGURE SHELLINABOX #================================================= @@ -84,6 +85,12 @@ ynh_systemd_action --service_name=shellinabox --action=restart # Calculate and store the config file checksum into the app settings ynh_store_file_checksum --file="/etc/default/shellinabox" +#================================================= +# ADVERTISE SERVICE IN ADMIN PANEL +#================================================= + +yunohost service add $app + #================================================= # RELOAD NGINX #=================================================