From 288edf81e242786bef3fae3e086fcf5449068813 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 11 Apr 2021 20:01:40 +0200 Subject: [PATCH] Fix start line_match --- scripts/install | 18 +++++++++--------- scripts/upgrade | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/scripts/install b/scripts/install index eadbd11..7ba4879 100644 --- a/scripts/install +++ b/scripts/install @@ -120,14 +120,6 @@ ynh_add_nginx_config #================================================= # SPECIFIC SETUP -#================================================= -# SETUP SYSTEMD -#================================================= -ynh_script_progression --message="Configuring a systemd service..." - -# Create a dedicated systemd config -ynh_add_systemd_config --others_var="mongodb_servicename ynh_node" - #================================================= # ADD A CONFIGURATION #================================================= @@ -138,6 +130,14 @@ ynh_add_config --template=".env" --destination="$final_path/.env" chmod 400 "$final_path/.env" chown $app:$app "$final_path/.env" +#================================================= +# SETUP SYSTEMD +#================================================= +ynh_script_progression --message="Configuring a systemd service..." + +# Create a dedicated systemd config +ynh_add_systemd_config --others_var="mongodb_servicename ynh_node" + #================================================= # GENERIC FINALIZATION #================================================= @@ -153,7 +153,7 @@ yunohost service add $app --description="Wekan daemon" ynh_script_progression --message="Starting a systemd service..." # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Meteor APM: completed instrumenting the app" +ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Enabling LDAP Background Sync" if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then sleep 60 diff --git a/scripts/upgrade b/scripts/upgrade index 68f537f..e427579 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -175,14 +175,6 @@ ynh_install_mongo #================================================= # SPECIFIC UPGRADE -#================================================= -# SETUP SYSTEMD -#================================================= -ynh_script_progression --message="Upgrading systemd configuration..." - -# Create a dedicated systemd config -ynh_add_systemd_config --others_var="mongodb_servicename ynh_node" - #================================================= # UPDATE A CONFIG FILE #================================================= @@ -193,6 +185,14 @@ ynh_add_config --template=".env" --destination="$final_path/.env" chmod 400 "$final_path/.env" chown $app:$app "$final_path/.env" +#================================================= +# SETUP SYSTEMD +#================================================= +ynh_script_progression --message="Upgrading systemd configuration..." + +# Create a dedicated systemd config +ynh_add_systemd_config --others_var="mongodb_servicename ynh_node" + #================================================= # GENERIC FINALIZATION #=================================================