diff --git a/check_process b/check_process index 5245d0d..e254c88 100644 --- a/check_process +++ b/check_process @@ -18,8 +18,6 @@ wrong_user=0 wrong_path=1 change_url=1 -;;; Levels - Level 5=auto # https://github.com/YunoHost-Apps/netdata_ynh/issues/4 ;;; Options Email= diff --git a/manifest.json b/manifest.json index 5953763..43ce56f 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "real-time performance and health monitoring", "fr": "Monitoring serveur en temps reel" }, - "version": "1.26.0~ynh1", + "version": "1.26.0~ynh2", "url": "http://my-netdata.io/", "license": "GPL-3.0", "maintainer": { @@ -15,7 +15,7 @@ "url": "" }, "requirements": { - "yunohost": ">= 3.7.0" + "yunohost": ">= 3.8.1" }, "multi_instance": false, "services": [ diff --git a/scripts/backup b/scripts/backup index 9440f6f..823f78a 100644 --- a/scripts/backup +++ b/scripts/backup @@ -24,7 +24,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +ynh_print_info --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME @@ -34,46 +34,20 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) #================================================= # STANDARD BACKUP STEPS #================================================= - ynh_print_info --message="Declaring files to be backed up..." -# N.B.: the following 'ynh_backup' calls are only a *declaration* of what needs -# to be backuped and not an actual copy of any file. The actual backup that -# creates and fill the archive with the files happens in the core after this -# script is called. Hence ynh_backups calls takes basically 0 seconds to run - -#================================================= -# STOP SYSTEMD SERVICE -#================================================= -ynh_print_info --message="Stopping a systemd service..." - -ynh_systemd_action --service_name=$app --action="stop" --log_path="$final_path/var/log/$app/error.log" - #================================================= # BACKUP THE APP MAIN DIR #================================================= -ynh_print_info --message="Backing up Netdata configuration directory..." ynh_backup --src_path="$final_path/etc/netdata" #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= -ynh_print_info --message="Backing up nginx web server configuration..." ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# SPECIFIC BACKUP -#================================================= - -#================================================= -# START SYSTEMD SERVICE -#================================================= -ynh_print_info --message="Starting a systemd service..." - -ynh_systemd_action --service_name=$app --action="start" --log_path="$final_path/var/log/$app/error.log" - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/install b/scripts/install index 0f7d350..f25c0dc 100644 --- a/scripts/install +++ b/scripts/install @@ -118,7 +118,7 @@ configure_netdata # INTEGRATE SERVICE IN YUNOHOST #================================================= -yunohost service add $app --description "Real-time performance and health monitoring for systems and applications" --log "$final_path/var/log/netdata/error.log" "$final_path/var/log/netdata/access.log" "$final_path/var/log/netdata/debug.log" +yunohost service add $app --description="Real-time performance and health monitoring for systems and applications" --log="$final_path/var/log/netdata/error.log" "$final_path/var/log/netdata/access.log" "$final_path/var/log/netdata/debug.log" #================================================= # START SYSTEMD SERVICE @@ -128,7 +128,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=2 # Start a systemd service ynh_systemd_action --service_name=$app --action="restart" --log_path="$final_path/var/log/$app/error.log" - #================================================= # SETUP SSOWAT #================================================= @@ -144,7 +143,6 @@ fi # Add direct access in the portal to admin only ynh_permission_update --permission "main" --add "$admin" - #================================================= # RELOAD NGINX #================================================= diff --git a/scripts/restore b/scripts/restore index 3e55786..2deb609 100644 --- a/scripts/restore +++ b/scripts/restore @@ -71,7 +71,7 @@ ynh_install_app_dependencies $pkg_dependencies # INSTALL AND RESTORE THE APP CONFIGURATION #================================================= -ynh_script_progression --message="Reinstalling Netdata..." --weight=180 +ynh_script_progression --message="Reinstalling Netdata..." --weight=18 # Download, check integrity, uncompress and patch the source from app.src NETDATA_TMPDIR=$(mktemp -d) @@ -87,7 +87,7 @@ configure_netdata # INTEGRATE SERVICE IN YUNOHOST #================================================= -yunohost service add $app --description "A short description of the app" --log "$final_path/var/log/netdata/error.log" "$final_path/var/log/netdata/access.log" "$final_path/var/log/netdata/debug.log" +yunohost service add $app --description="Real-time performance and health monitoring for systems and applications" --log="$final_path/var/log/netdata/error.log" "$final_path/var/log/netdata/access.log" "$final_path/var/log/netdata/debug.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index b6ad8ee..a13f129 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -69,13 +69,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 #================================================= @@ -86,7 +79,7 @@ path_url=$(ynh_normalize_url_path --path_url=$path_url) if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Upgrading source files..." --weight=180 + ynh_script_progression --message="Upgrading source files..." --weight=18 #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -153,6 +146,12 @@ if [[ $is_public -eq 1 ]]; then ynh_permission_update --permission "main" --add "visitors" fi +#================================================= +# INTEGRATE SERVICE IN YUNOHOST +#================================================= + +yunohost service add $app --description="Real-time performance and health monitoring for systems and applications" --log="$final_path/var/log/netdata/error.log" "$final_path/var/log/netdata/access.log" "$final_path/var/log/netdata/debug.log" + #================================================= # START SYSTEMD SERVICE #=================================================