diff --git a/README.md b/README.md index 623e665..1592219 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Huginn is a system for building agents that perform automated tasks for you online. They can read the web, watch for events, and take actions on your behalf. Huginn's Agents create and consume events, propagating them along a directed graph. Think of it as a hackable version of IFTTT or Zapier on your own server. You always know who has your data. You do. -**Shipped version:** 2022.03.24~ynh1 +**Shipped version:** 2022.03.24~ynh2 diff --git a/README_fr.md b/README_fr.md index 0b804d9..4cb7d3e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Huginn is a system for building agents that perform automated tasks for you online. They can read the web, watch for events, and take actions on your behalf. Huginn's Agents create and consume events, propagating them along a directed graph. Think of it as a hackable version of IFTTT or Zapier on your own server. You always know who has your data. You do. -**Version incluse :** 2022.03.24~ynh1 +**Version incluse :** 2022.03.24~ynh2 diff --git a/check_process b/check_process index 229c516..794499f 100644 --- a/check_process +++ b/check_process @@ -13,7 +13,8 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=CommitHash + # 2022.03.24~ynh1 + upgrade=1 from_commit=a91277b139619ac194956c997f77a52172a822d3 backup_restore=1 multi_instance=1 port_already_use=0 diff --git a/manifest.json b/manifest.json index 6eee812..1c7b8ea 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": " Build agents that monitor and act on your behalf. Your agents are standing by!" }, - "version": "2022.03.24~ynh1", + "version": "2022.03.24~ynh2", "url": "https://github.com/huginn/hugin", "upstream": { "license": "MIT", 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