diff --git a/check_process b/check_process index 8c8a43a..5e5eb9c 100644 --- a/check_process +++ b/check_process @@ -17,7 +17,7 @@ multi_instance=0 port_already_use=1 change_url=1 - actions=1 + actions=0 config_panel=0 ;;; Options Notification=all diff --git a/scripts/_common.sh b/scripts/_common.sh index ff934a5..4b358cd 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -3,14 +3,14 @@ # # Release to install -VERSION=0.117.6 +VERSION=2021.1.4 # Package dependencies PKG_DEPENDENCIES="python3 python3-dev python3-venv python3-pip libffi-dev libssl-dev libjpeg-dev zlib1g-dev autoconf build-essential libopenjp2-7 libtiff5" # Requirements (Major.Minor.Patch) # PY_VERSION=$(curl -s "https://www.python.org/ftp/python/" | grep ">3.8" | tail -n1 | cut -d '/' -f 2 | cut -d '>' -f 2) -PY_REQUIRED_VERSION=3.8.6 +PY_REQUIRED_VERSION=3.8.7 # Execute a command as another user # usage: exec_as USER COMMAND [ARG ...] @@ -108,8 +108,8 @@ myynh_install_dependencies () { # Install cd "Python-$python" ./configure --enable-optimizations - make -j4 - make altinstall + ynh_exec_warn_less make -j4 + ynh_exec_warn_less make altinstall # Clean cd .. ynh_secure_remove "Python-$python" diff --git a/scripts/backup b/scripts/backup index 6b8d835..473b1b1 100644 --- a/scripts/backup +++ b/scripts/backup @@ -16,17 +16,17 @@ domain=$(ynh_app_setting_get --app="$app" --key=domain) final_path="/opt/yunohost/$app" home_path="/home/$app" -ynh_script_progression --message="Storing the python version in settings..." +ynh_print_info --message="Storing the python version in settings..." # store python version python=$(cat "$final_path/bin/python3" --version | cut -d ' ' -f 2) ynh_app_setting_set --app="$app" --key=python --value="$python" # backup source & conf files -ynh_script_progression --message="Backuping the app, datas & ystem files..." +ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$final_path" ynh_backup --src_path="$home_path" ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_backup --src_path="/etc/sudoers.d/$app" ynh_backup --src_path="/etc/systemd/system/$app@$app.service" -ynh_script_progression --message="Backup of $app completed" --last +ynh_print_info --message="Backup of $app completed" diff --git a/scripts/restore b/scripts/restore index 8c2035c..b59f50f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -66,7 +66,7 @@ ynh_systemd_action --service_name="$app@$app" --action=start --line_match="Home # remove --verbose from service and restart ynh_replace_string --match_string=" --verbose" --replace_string="" --target_file="/etc/systemd/system/$app@$app.service" systemctl daemon-reload -ynh_systemd_action --service_name="$app@$app" --action=restart +ynh_systemd_action --service_name="$app@$app" --action=restart --line_match="Started Home Assistant" --log_path="systemd" --timeout=3600 ynh_script_progression --message="Restoring nginx web server..." ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"