From e19b3be744f21054c6e12aeea1bacd13358d8cd0 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Thu, 9 Mar 2023 13:23:35 +0100 Subject: [PATCH 1/4] Update manifest.toml --- manifest.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.toml b/manifest.toml index 97d4e67..542184d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -30,6 +30,7 @@ ram.runtime = "50M" [install.domain] # this is a generic question - ask strings are automatically handled by Yunohost's core type = "domain" + full_domain = true [install.init_main_permission] type = "group" From 223fa3ca1c03d74feb3f1f9a79f4a91251242bdc Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Thu, 9 Mar 2023 13:38:15 +0100 Subject: [PATCH 2/4] more cleanup --- scripts/install | 6 +++--- scripts/restore | 6 +++--- scripts/upgrade | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/install b/scripts/install index f251d6e..b35751d 100755 --- a/scripts/install +++ b/scripts/install @@ -92,7 +92,7 @@ ynh_add_systemd_config --service="${app}_workers" --template="fittrackee_workers # INTEGRATE SERVICE IN YUNOHOST ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log" +yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log" --log="/var/log/$app/gunicorn.log" yunohost service add "${app}_workers" --description="Fittrackee task queue service" --log="var/log/$app/${app}_workers.log" @@ -108,8 +108,8 @@ yunohost service add "${app}_workers" --description="Fittrackee task queue servi ynh_script_progression --message="Starting the systemd services..." --weight=15 # Start a systemd service -ynh_systemd_action --service_name="${app}" --action="start" --log_path="/var/log/$app/$app.log" --line_match="Booting worker with pid" -ynh_systemd_action --service_name="${app}_workers" --action="start" --log_path="/var/log/$app/${app}_workers.log" --line_match="Started" +ynh_systemd_action --service_name="${app}" --action="start" +ynh_systemd_action --service_name="${app}_workers" --action="start" #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index d083c44..458f492 100644 --- a/scripts/restore +++ b/scripts/restore @@ -67,7 +67,7 @@ systemctl enable "${app}_workers.service" --quiet #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log" +yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log" --log="/var/log/$app/gunicorn.log" yunohost service add "${app}_workers" --description="Fittrackee task queue service" --log="var/log/$app/${app}_workers.log" #================================================= @@ -75,8 +75,8 @@ yunohost service add "${app}_workers" --description="Fittrackee task queue servi #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name="${app}" --action="start" --log_path="/var/log/$app/$app.log" --line_match="Booting worker with pid" -ynh_systemd_action --service_name="${app}_workers" --action="start" --log_path="/var/log/$app/${app}_workers.log" --line_match="Started" +ynh_systemd_action --service_name="${app}" --action="start" +ynh_systemd_action --service_name="${app}_workers" --action="start" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 2d07913..2b0e323 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -28,8 +28,8 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --action="stop" --service_name="${app}" --log_path="/var/log/$app/$app.log" --line_match="Stopped" -ynh_systemd_action --action="stop" --service_name="${app}_workers" --log_path="/var/log/$app/${app}_workers.log" --line_match="Stopped" +ynh_systemd_action --action="stop" --service_name="${app}" +ynh_systemd_action --action="stop" --service_name="${app}_workers" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -89,7 +89,7 @@ ynh_add_systemd_config --service="${app}_workers" --template="fittrackee_workers #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log" +yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log" --log="/var/log/$app/gunicorn.log" yunohost service add "${app}_workers" --description="Fittrackee task queue service" --log="var/log/$app/${app}_workers.log" #================================================= @@ -98,8 +98,8 @@ yunohost service add "${app}_workers" --description="Fittrackee task queue servi ynh_script_progression --message="Starting the systemd services..." --weight=15 # Start a systemd service -ynh_systemd_action --service_name="${app}" --action="start" --log_path="/var/log/$app/$app.log" --line_match="Booting worker with pid" -ynh_systemd_action --service_name="${app}_workers" --action="start" --log_path="/var/log/$app/${app}_workers.log" --line_match="Started" +ynh_systemd_action --service_name="${app}" --action="start" +ynh_systemd_action --service_name="${app}_workers" --action="start" #================================================= # END OF SCRIPT From c38295be0d015357981730b7430a652b063d13f5 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Thu, 9 Mar 2023 14:00:52 +0100 Subject: [PATCH 3/4] ~ynh2 --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 542184d..4fd11ec 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "FitTrackee" description.en = "Self-hosted outdoor activity tracker 🚴" description.fr = "Traqueur d’activités extérieures auto-hébergé 🚴" -version = "0.7.14~ynh1" +version = "0.7.14~ynh2" maintainers = ["Thovi98"] From 5d750d607c08a06537ec33ebb7431156fe4fbc4d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 9 Mar 2023 13:00:56 +0000 Subject: [PATCH 4/4] 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 b225aa1..0f307d9 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ FitTrackee allows you to track your outdoor activities (workouts) from gpx files No mobile app has been developed yet, but several existing mobile apps can store workouts data locally and export them into a gpx file. -**Shipped version:** 0.7.14~ynh1 +**Shipped version:** 0.7.14~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 4698e63..2c584e5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Traqueur d’activités extérieures auto-hébergé 🚴 -**Version incluse :** 0.7.14~ynh1 +**Version incluse :** 0.7.14~ynh2 ## Captures d’écran