From 83c1ac8226205fff5d98f9f3bb1dc6f5af94951b Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 2 Apr 2022 14:33:44 +0200 Subject: [PATCH] Fix bullseye --- scripts/_common.sh | 2 +- scripts/change_url | 4 ++-- scripts/install | 4 ++-- scripts/restore | 4 ++-- scripts/upgrade | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index d300e30..75df75e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ # dependencies used by the app pkg_dependencies="" -build_pkg_dependencies="default-libmysqlclient-dev libyaml-dev libgdbm-dev libncurses5-dev libffi-dev libcurl4-openssl-dev libicu-dev python-docutils pkg-config cmake nodejs graphviz jq" +build_pkg_dependencies="default-libmysqlclient-dev libyaml-dev libgdbm-dev libncurses5-dev libffi-dev libcurl4-openssl-dev libicu-dev python3-docutils pkg-config cmake nodejs graphviz jq" ruby_version=2.6 diff --git a/scripts/change_url b/scripts/change_url index 81a8a71..fef5119 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -132,8 +132,8 @@ chown $app:$app "$final_path/.env" ynh_script_progression --message="Starting a systemd service..." # Start a systemd service -ynh_systemd_action --service_name="$app-web" --action="start" --log_path="/var/log/$app/$app-web.log" --line_match="Started" -ynh_systemd_action --service_name="$app-jobs" --action="start" --log_path="$final_path/log/production.log" --line_match="Started" +ynh_systemd_action --service_name="$app-web" --action="start" --log_path="/var/log/$app/$app-web.log" --line_match="listening on addr" +ynh_systemd_action --service_name="$app-jobs" --action="start" --log_path="$final_path/log/huginn-jobs.log" --line_match="listening on addr" #================================================= # RELOAD NGINX diff --git a/scripts/install b/scripts/install index ebb76d2..2f25a88 100755 --- a/scripts/install +++ b/scripts/install @@ -180,8 +180,8 @@ yunohost service add "$app-jobs" --log="$final_path/log/production.log" ynh_script_progression --message="Starting a systemd service..." # Start a systemd service -ynh_systemd_action --service_name="$app-web" --action="start" --log_path="$final_path/log/unicorn.log" --line_match="Started" -ynh_systemd_action --service_name="$app-jobs" --action="start" --log_path="$final_path/log/production.log" --line_match="Starting" +ynh_systemd_action --service_name="$app-web" --action="start" --log_path="$final_path/log/unicorn.log" --line_match="listening on addr" +ynh_systemd_action --service_name="$app-jobs" --action="start" --log_path="$final_path/log/huginn-jobs.log" --line_match="Starting" #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index 0803a59..9035b60 100644 --- a/scripts/restore +++ b/scripts/restore @@ -137,8 +137,8 @@ yunohost service add "$app-jobs" --log="$final_path/log/production.log" ynh_script_progression --message="Starting a systemd service..." # Start a systemd service -ynh_systemd_action --service_name="$app-web" --action="start" --log_path="$final_path/log/unicorn.log" --line_match="Started" -ynh_systemd_action --service_name="$app-jobs" --action="start" --log_path="$final_path/log/production.log" --line_match="Starting" +ynh_systemd_action --service_name="$app-web" --action="start" --log_path="$final_path/log/unicorn.log" --line_match="listening on addr" +ynh_systemd_action --service_name="$app-jobs" --action="start" --log_path="$final_path/log/huginn-jobs.log" --line_match="Starting" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 6d7c483..9013e65 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -174,8 +174,8 @@ yunohost service add "$app-jobs" --log="$final_path/log/production.log" ynh_script_progression --message="Starting a systemd service..." # Start a systemd service -ynh_systemd_action --service_name="$app-web" --action="start" --log_path="$final_path/log/unicorn.log" --line_match="Started" -ynh_systemd_action --service_name="$app-jobs" --action="start" --log_path="$final_path/log/production.log" --line_match="Starting" +ynh_systemd_action --service_name="$app-web" --action="start" --log_path="$final_path/log/unicorn.log" --line_match="listening on addr" +ynh_systemd_action --service_name="$app-jobs" --action="start" --log_path="$final_path/log/huginn-jobs.log" --line_match="Starting" #================================================= # RELOAD NGINX