diff --git a/check_process b/check_process index 2faba26..f83c2c0 100644 --- a/check_process +++ b/check_process @@ -22,14 +22,3 @@ port_already_use=1 (8080) final_path_already_use=1 change_url=1 -;;; Levels - Level 1=auto - Level 2=auto - Level 3=auto - Level 4=na - Level 5=auto - Level 6=auto - Level 7=auto - Level 8=0 - Level 9=0 - Level 10=0 diff --git a/scripts/backup b/scripts/backup index eb22025..f1cf658 100755 --- a/scripts/backup +++ b/scripts/backup @@ -4,16 +4,16 @@ # GENERIC START #================================================= +# Import common cmd +source ../settings/scripts/experimental_helper.sh +source ../settings/scripts/_common.sh + # Source YunoHost helpers source /usr/share/yunohost/helpers # Stop script if errors ynh_abort_if_errors -# Import common cmd -source ../settings/scripts/experimental_helper.sh -source ../settings/scripts/_common.sh - # Retrieve arguments ynh_script_progression --message="Loading installation settings..." domain=$(ynh_app_setting_get --app $app --key domain) diff --git a/scripts/change_url b/scripts/change_url index 25db430..2e1e383 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -4,16 +4,16 @@ # GENERIC START #================================================= +# Import common cmd +source ./experimental_helper.sh +source ./_common.sh + # Source YunoHost helpers source /usr/share/yunohost/helpers # Stop script if errors ynh_abort_if_errors -# Import common cmd -source ./experimental_helper.sh -source ./_common.sh - ynh_script_progression --message="Loading installation settings..." # Retrive arguments diff --git a/scripts/install b/scripts/install index d4299d7..1ff1e37 100755 --- a/scripts/install +++ b/scripts/install @@ -4,16 +4,16 @@ # GENERIC START #================================================= +# Import common cmd +source ./experimental_helper.sh +source ./_common.sh + # Source YunoHost helpers source /usr/share/yunohost/helpers # Stop script if errors ynh_abort_if_errors -# Import common cmd -source ./experimental_helper.sh -source ./_common.sh - ynh_script_progression --message="Validating installation parameters..." # Retrieve arguments diff --git a/scripts/remove b/scripts/remove index 5f4fd5c..3655351 100755 --- a/scripts/remove +++ b/scripts/remove @@ -4,9 +4,6 @@ # GENERIC START #================================================= -# Source YunoHost helpers -source /usr/share/yunohost/helpers - # Stop script if errors set -u @@ -14,6 +11,9 @@ set -u source ./experimental_helper.sh source ./_common.sh +# Source YunoHost helpers +source /usr/share/yunohost/helpers + ynh_script_progression --message="Loading installation settings..." diff --git a/scripts/restore b/scripts/restore index 4d7fd2e..c4ebcf4 100755 --- a/scripts/restore +++ b/scripts/restore @@ -4,16 +4,16 @@ # GENERIC START #================================================= +# Import common cmd +source ../settings/scripts/experimental_helper.sh +source ../settings/scripts/_common.sh + # Source YunoHost helpers source /usr/share/yunohost/helpers # Stop script if errors ynh_abort_if_errors -# Import common cmd -source ../settings/scripts/experimental_helper.sh -source ../settings/scripts/_common.sh - ynh_script_progression --message="Loading settings..." # Retrieve old app settings @@ -55,6 +55,9 @@ ynh_restore ynh_script_progression --message="Protecting directory..." set_permission +# register yunohost service +yunohost service add monitorix + # Reload nginx systemctl reload nginx.service diff --git a/scripts/upgrade b/scripts/upgrade index 9cd754d..a63538d 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -4,16 +4,16 @@ # GENERIC START #================================================= +# Import common cmd +source ./experimental_helper.sh +source ./_common.sh + # Source YunoHost helpers source /usr/share/yunohost/helpers # Stop script if errors ynh_abort_if_errors -# Import common cmd -source ./experimental_helper.sh -source ./_common.sh - ynh_script_progression --message="Loading installation settings..." # Retrieve app settings @@ -68,6 +68,9 @@ ynh_secure_remove --file=/usr/share/yunohost/hooks/post_iptable_rules/50-$app ynh_script_progression --message="Protecting directory..." set_permission +# register yunohost service +yunohost service add monitorix + # Reload monitorix # While we stop monitorix sometime the built-in web server is not stopped cleanly. So are sure that everything is cleanly stoped by that # So this fix that