From a84fe5cff126e38877b75dba314de47376152bd0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 6 May 2022 18:08:38 +0000 Subject: [PATCH 1/3] Upgrade to v4.2.2 --- conf/app.src | 4 ++-- manifest.json | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index 4e5359f..b1af8ca 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/tracim/tracim/archive/refs/tags/release_04.02.00.tar.gz -SOURCE_SUM=b8d2ed27a94962e9c10a03c2548cf489a3b16cf3d3302cec1fda4b065d5273c3 +SOURCE_URL=https://api.github.com/repos/tracim/tracim/tarball/release_04.02.02 +SOURCE_SUM=0da81544a65e9678b2f26729b06f166c084c7756a799dc755d1d9e75b37b96cb SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 5d27e41..43fc0d6 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Collaborative platform software intended for (not only technical) team collaboration." }, - "version": "4.2.0~ynh1", + "version": "4.2.2~ynh1", "url": "https://www.tracim.fr", "upstream": { "license": "AGPL-3.0-or-later,LGPL-3.0-or-later,CC-BY-SA-2.5,MIT", @@ -44,7 +44,13 @@ "en": "Choose the application language", "fr": "Choisissez la langue de l'application" }, - "choices": ["fr", "en", "pt", "de", "ar"], + "choices": [ + "fr", + "en", + "pt", + "de", + "ar" + ], "default": "fr" }, { From 324b2a1136967de8c1d09f712e95c4af23700d12 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 6 May 2022 18:08:44 +0000 Subject: [PATCH 2/3] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2967614..8e659e6 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Tracim is a collaborative platform software intended for (not only technical) team collaboration. It is simple to use, offers a user-friendly interface and runs on every computer. It is very valuable for R&D teams, assocations, remote collaboration. -**Shipped version:** 4.2.0~ynh1 +**Shipped version:** 4.2.2~ynh1 **Demo:** https://www.algoo.fr/fr/tracim/demo diff --git a/README_fr.md b/README_fr.md index 04282ce..330d596 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Tracim is a collaborative platform software intended for (not only technical) team collaboration. It is simple to use, offers a user-friendly interface and runs on every computer. It is very valuable for R&D teams, assocations, remote collaboration. -**Version incluse :** 4.2.0~ynh1 +**Version incluse :** 4.2.2~ynh1 **Démo :** https://www.algoo.fr/fr/tracim/demo From f06f44215580674da5d5a407ceb711721605f0b5 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 7 May 2022 15:21:19 +0200 Subject: [PATCH 3/3] Fix bullseye --- conf/supervisord.conf | 5 +++-- scripts/change_url | 8 -------- scripts/install | 1 - scripts/restore | 1 - scripts/upgrade | 8 -------- 5 files changed, 3 insertions(+), 20 deletions(-) diff --git a/conf/supervisord.conf b/conf/supervisord.conf index b90f0c8..c1d205c 100644 --- a/conf/supervisord.conf +++ b/conf/supervisord.conf @@ -1,5 +1,6 @@ [supervisord] -; You need to replace with correct absolute path +nodaemon=true +user=root ; email notifier (if async jobs processing is enabled) [program:tracim_mail_notifier] @@ -39,4 +40,4 @@ stdout_logfile =/tmp/rq_database_worker.log redirect_stderr=true autostart=true autorestart=true -environment=TRACIM_CONF_PATH=__FINALPATH__/backend/development.ini \ No newline at end of file +environment=TRACIM_CONF_PATH=__FINALPATH__/backend/development.ini diff --git a/scripts/change_url b/scripts/change_url index 76a90e0..1a58073 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -78,13 +78,6 @@ fi #================================================= # STANDARD MODIFICATIONS -#================================================= -# STOP SYSTEMD SERVICE -#================================================= -ynh_script_progression --message="Stopping a systemd service..." - -ynh_supervisor_action --service_name=$app --action="stop" --log_path="/var/log/supervisor/supervisord.log" - #================================================= # MODIFY URL IN NGINX CONF #================================================= @@ -141,7 +134,6 @@ ynh_script_progression --message="Starting a systemd service..." # Start a systemd service ynh_systemd_action --service_name="uwsgi" --action="restart" --log_path="/var/log/uwsgi/app/$app-web.log" --line_match="spawned uWSGI" -ynh_supervisor_action --service_name="$app" --action="restart" --log_path="/var/log/supervisor/supervisord.log" #================================================= # RELOAD NGINX diff --git a/scripts/install b/scripts/install index 51fa273..8a14040 100755 --- a/scripts/install +++ b/scripts/install @@ -240,7 +240,6 @@ ynh_script_progression --message="Starting a systemd service..." # Start a systemd service ynh_systemd_action --service_name="uwsgi" --action="restart" --log_path="/var/log/uwsgi/app/$app-web.log" --line_match="spawned uWSGI" -ynh_supervisor_action --service_name="$app" --action="restart" --log_path="/var/log/supervisor/supervisord.log" #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index 56a5e6c..e398bdd 100755 --- a/scripts/restore +++ b/scripts/restore @@ -148,7 +148,6 @@ ynh_script_progression --message="Starting a systemd service..." # Start a systemd service ynh_systemd_action --service_name="uwsgi" --action="restart" --log_path="/var/log/uwsgi/app/$app-web.log" --line_match="spawned uWSGI" -ynh_supervisor_action --service_name="$app" --action="restart" --log_path="/var/log/supervisor/supervisord.log" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 55da268..f9b5261 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -56,13 +56,6 @@ ynh_abort_if_errors #================================================= # STANDARD UPGRADE STEPS -#================================================= -# STOP SYSTEMD SERVICE -#================================================= -ynh_script_progression --message="Stopping a systemd service..." - -ynh_supervisor_action --service_name=$app --action="stop" --log_path="/var/log/supervisor/supervisord.log" - #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= @@ -210,7 +203,6 @@ ynh_script_progression --message="Starting a systemd service..." # Start a systemd service ynh_systemd_action --service_name="uwsgi" --action="restart" --log_path="/var/log/uwsgi/app/$app-web.log" --line_match="spawned uWSGI" -ynh_supervisor_action --service_name="$app" --action="restart" --log_path="/var/log/supervisor/supervisord.log" #================================================= # RELOAD NGINX