From ee3d1fee7955f2c92a995c93959d7e25028d35f7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 4 Dec 2020 11:55:06 +0100 Subject: [PATCH] Fix linter warnings --- check_process | 2 -- manifest.json | 4 ++-- scripts/change_url | 8 +++++++- scripts/install | 2 +- scripts/restore | 4 ++-- scripts/upgrade | 2 +- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/check_process b/check_process index d0be191..12788aa 100644 --- a/check_process +++ b/check_process @@ -24,8 +24,6 @@ multi_instance=1 port_already_use=0 change_url=1 -;;; Levels - Level 5=auto ;;; Options Email= Notification=none diff --git a/manifest.json b/manifest.json index 9aa487d..85a3abf 100644 --- a/manifest.json +++ b/manifest.json @@ -10,10 +10,10 @@ "url": "https://etherpad.org/", "license": "Apache-2.0", "maintainer": { - "name": "" + "name": "eric_G" }, "requirements": { - "yunohost": ">= 4.0.7" + "yunohost": ">= 4.0.8" }, "multi_instance": true, "services": [ diff --git a/scripts/change_url b/scripts/change_url index 860179c..d806ef0 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -102,7 +102,13 @@ then fi #================================================= -# GENERIC FINALISATION +# SETUP SYSTEMD +#================================================= +ynh_script_progression --message="Configuring a systemd service..." --weight=4 + +# Create a dedicated systemd config +ynh_add_systemd_config --others_var="ynh_node_load_PATH" + #================================================= # START SYSTEMD SERVICE #================================================= diff --git a/scripts/install b/scripts/install index ee10f7e..5db351d 100644 --- a/scripts/install +++ b/scripts/install @@ -175,7 +175,7 @@ ynh_add_systemd_config --others_var="ynh_node_load_PATH" #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=3 -yunohost service add $app --description "Collaborative editor." --log "/var/log/$app/$app.log" +yunohost service add $app --description="Collaborative editor." --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/restore b/scripts/restore index 621fda3..888b4b6 100644 --- a/scripts/restore +++ b/scripts/restore @@ -101,14 +101,14 @@ ynh_script_progression --message="Restoring the systemd configuration..." --weig #ynh_restore_file --origin_path="/etc ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -systemctl enable $app.service +systemctl enable $app.service --quiet #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=3 -yunohost service add $app --description "Collaborative editor." --log "/var/log/$app/$app.log" +yunohost service add $app --description="Collaborative editor." --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index 483d986..87573d7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -171,7 +171,7 @@ ynh_add_systemd_config --others_var="ynh_node_load_PATH" #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=2 -yunohost service add $app --description "Collaborative editor." --log "/var/log/$app/$app.log" +yunohost service add $app --description="Collaborative editor." --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE