From 0cc0937243b3c528f660026b9e457aee2beea159 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 26 Dec 2020 00:20:20 +0100 Subject: [PATCH 1/4] Please add --quiet to systemctl enable/disable commands --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 0c518e8..cb7cb04 100644 --- a/scripts/restore +++ b/scripts/restore @@ -101,7 +101,7 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app" ynh_script_progression --message="Restoring the systemd configuration..." ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -systemctl enable $app.service +systemctl enable $app.service --quiet #================================================= # INTEGRATE SERVICE IN YUNOHOST From 00f0d18eb060c8f665ccd15ba54e9c28440fa4f9 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 26 Dec 2020 00:21:06 +0100 Subject: [PATCH 2/4] You probably don't need to call 'ynh_normalize_url_path'... --- scripts/upgrade | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 0e8eb15..63a921a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -63,13 +63,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 #================================================= From a16c8d0f4c4bc1c6afac58bec8382c07dbeb3cc0 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 26 Dec 2020 00:22:51 +0100 Subject: [PATCH 3/4] Please add --quiet to systemctl enable/disable commands --- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 1c46bee..7f73858 100644 --- a/scripts/install +++ b/scripts/install @@ -74,7 +74,7 @@ ynh_script_progression --message="Installing dependencies..." ynh_install_app_dependencies $pkg_dependencies ynh_install_extra_app_dependencies --repo="deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" --package="$extra_pkg_dependencies" --key="https://artifacts.elastic.co/GPG-KEY-elasticsearch" -systemctl enable elasticsearch.service +systemctl enable elasticsearch.service --quiet systemctl start elasticsearch.service ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" diff --git a/scripts/restore b/scripts/restore index cb7cb04..40f754e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -83,7 +83,7 @@ ynh_script_progression --message="Reinstalling dependencies..." # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies ynh_install_extra_app_dependencies --repo="deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" --package="$extra_pkg_dependencies" --key="https://artifacts.elastic.co/GPG-KEY-elasticsearch" -systemctl enable elasticsearch.service +systemctl enable elasticsearch.service --quiet systemctl start elasticsearch.service ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" diff --git a/scripts/upgrade b/scripts/upgrade index 63a921a..f153625 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -103,7 +103,7 @@ ynh_script_progression --message="Upgrading dependencies..." ynh_install_app_dependencies $pkg_dependencies ynh_install_extra_app_dependencies --repo="deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" --package="$extra_pkg_dependencies" --key="https://artifacts.elastic.co/GPG-KEY-elasticsearch" -systemctl enable elasticsearch.service +systemctl enable elasticsearch.service --quiet systemctl start elasticsearch.service ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" From 7c53ca6dcef0583c97b55759778d3b9a444f6e88 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 26 Dec 2020 00:23:44 +0100 Subject: [PATCH 4/4] Using option '--log_type systemd' with 'yunohost service add' is not relevant anymore --- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 7f73858..c9bf422 100644 --- a/scripts/install +++ b/scripts/install @@ -170,7 +170,7 @@ ynh_use_logrotate #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "$app search index daemon" --log_type systemd +yunohost service add $app --description "$app search index daemon" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/restore b/scripts/restore index 40f754e..deb7278 100644 --- a/scripts/restore +++ b/scripts/restore @@ -108,7 +108,7 @@ systemctl enable $app.service --quiet #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "$app search index daemon" --log_type systemd +yunohost service add $app --description "$app search index daemon" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index f153625..48723ca 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -172,7 +172,7 @@ ynh_use_logrotate --non-append #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "$app search index daemon" --log_type systemd +yunohost service add $app --description "$app search index daemon" #================================================= # START SYSTEMD SERVICE