From e596f011503e1af649ab78ef00d994c7deab46a7 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 28 Apr 2022 01:15:33 +0200 Subject: [PATCH] Fix 1.2.4 --- scripts/install | 6 ++++-- scripts/restore | 4 ++-- scripts/upgrade | 6 ++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 2cd9ba1..281a190 100644 --- a/scripts/install +++ b/scripts/install @@ -174,6 +174,8 @@ pushd $final_path pip install --upgrade pip pip install --upgrade setuptools ynh_exec_warn_less pip install wheel + # Workaround for error AttributeError: module 'lib' has no attribute 'X509_V_FLAG_CB_ISSUER_CHECK' + ynh_replace_string --match_string="pyOpenSSL~=20.0.1" --replace_string="pyOpenSSL~=21.0.0" --target_file="$final_path/api/requirements/base.txt" ynh_exec_warn_less pip install -r api/requirements.txt popd @@ -214,9 +216,9 @@ yunohost service add "${app}-worker" ynh_script_progression --message="Starting a systemd service..." # Start a systemd service -ynh_systemd_action --service_name="${app}-beat" --action="start" --log_path="systemd" --line_match="Running with the following plugins enabled" +ynh_systemd_action --service_name="${app}-beat" --action="start" --log_path="systemd" --line_match="Started" ynh_systemd_action --service_name="${app}-server" --action="start" --log_path="systemd" --line_match="Application startup complete" -ynh_systemd_action --service_name="${app}-worker" --action="start" --log_path="systemd" --line_match="Running with the following plugins enabled" +ynh_systemd_action --service_name="${app}-worker" --action="start" --log_path="systemd" --line_match="ready" #================================================= # SETUP FAIL2BAN diff --git a/scripts/restore b/scripts/restore index 1e279a5..658b02f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -131,9 +131,9 @@ yunohost service add "${app}-worker" #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --service_name="${app}-beat" --action="start" --log_path="systemd" --line_match="Running with the following plugins enabled" +ynh_systemd_action --service_name="${app}-beat" --action="start" --log_path="systemd" --line_match="Started" ynh_systemd_action --service_name="${app}-server" --action="start" --log_path="systemd" --line_match="Application startup complete" -ynh_systemd_action --service_name="${app}-worker" --action="start" --log_path="systemd" --line_match="Running with the following plugins enabled" +ynh_systemd_action --service_name="${app}-worker" --action="start" --log_path="systemd" --line_match="ready" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 02a3bc8..c424e35 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -197,6 +197,8 @@ pushd $final_path pip install --upgrade pip pip install --upgrade setuptools ynh_exec_warn_less pip install wheel + # Workaround for error AttributeError: module 'lib' has no attribute 'X509_V_FLAG_CB_ISSUER_CHECK' + ynh_replace_string --match_string="pyOpenSSL~=20.0.1" --replace_string="pyOpenSSL~=21.0.0" --target_file="$final_path/api/requirements/base.txt" ynh_exec_warn_less pip install -r api/requirements.txt popd @@ -277,9 +279,9 @@ yunohost service add "${app}-worker" ynh_script_progression --message="Starting a systemd service..." # Start a systemd service -ynh_systemd_action --service_name="${app}-beat" --action="start" --log_path="systemd" --line_match="Running with the following plugins enabled" +ynh_systemd_action --service_name="${app}-beat" --action="start" --log_path="systemd" --line_match="Started" ynh_systemd_action --service_name="${app}-server" --action="start" --log_path="systemd" --line_match="Application startup complete" -ynh_systemd_action --service_name="${app}-worker" --action="start" --log_path="systemd" --line_match="Running with the following plugins enabled" +ynh_systemd_action --service_name="${app}-worker" --action="start" --log_path="systemd" --line_match="ready" #================================================= # UPGRADE FAIL2BAN