From 9346c9b6b954103d45ee51156cdb4f5b5094e482 Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Mon, 31 Jul 2023 21:59:19 +0200 Subject: [PATCH 01/27] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 8e3f2c2..795d9c2 100644 --- a/manifest.toml +++ b/manifest.toml @@ -46,7 +46,7 @@ ram.runtime = "50M" sha256 = "49e8be5183396b3cd25a09e682e7f10e5e7249b609e760c118f7349d38e7aaa7" in_subdir = false autoupdate.strategy = "latest_github_release" - autoupdate.asset = "grocy_*.zip" + autoupdate.asset = "grocy_.*.zip" [resources.system_user] From 145005c7e61e038110f5cf25886f00c223d8d0f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 3 Aug 2023 16:04:12 +0200 Subject: [PATCH 02/27] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 795d9c2..c45a343 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Grocy" description.en = "Web-based groceries & household management solution for your home" description.fr = "Solution Web de gestion d'épicerie et de gestion de la maison" -version = "4.0.0~ynh2" +version = "4.0.0~ynh3" maintainers = ["eric_G"] @@ -60,4 +60,4 @@ ram.runtime = "50M" api.protected = true [resources.apt] - packages = "php8.2-ldap php8.2-mbstring php8.2-fileinfo php8.2-sqlite3 php8.2-gd php8.2-intl" + packages = "php8.1-ldap php8.1-mbstring php8.1-fileinfo php8.1-sqlite3 php8.1-gd php8.1-intl" From f31bccc6246f25ba6322885d3bff0d15801ce851 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 3 Aug 2023 14:04:17 +0000 Subject: [PATCH 03/27] 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 4983387..424da53 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 grocy is a web-based self-hosted groceries & household management solution for your home. -**Shipped version:** 4.0.0~ynh2 +**Shipped version:** 4.0.0~ynh3 **Demo:** https://en.demo.grocy.info/stockoverview diff --git a/README_fr.md b/README_fr.md index ad23203..1ea95d5 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 grocy is a web-based self-hosted groceries & household management solution for your home. -**Version incluse :** 4.0.0~ynh2 +**Version incluse :** 4.0.0~ynh3 **Démo :** https://en.demo.grocy.info/stockoverview From f1a1a1c92ca16aa31c08178f2e57cdbf1c337779 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 6 Aug 2023 16:02:11 +0200 Subject: [PATCH 04/27] Update manifest.toml --- manifest.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index c45a343..0479dc6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Grocy" description.en = "Web-based groceries & household management solution for your home" description.fr = "Solution Web de gestion d'épicerie et de gestion de la maison" -version = "4.0.0~ynh3" +version = "4.0.1~ynh1" maintainers = ["eric_G"] @@ -42,8 +42,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/grocy/grocy/releases/download/v4.0.0/grocy_4.0.0.zip" - sha256 = "49e8be5183396b3cd25a09e682e7f10e5e7249b609e760c118f7349d38e7aaa7" + url = "https://github.com/grocy/grocy/releases/download/v4.0.1/grocy_4.0.1.zip" + sha256 = "1deb09382eef102b591c4500b68e4027829dbb21d71ae8637b692daa5ec33a09" in_subdir = false autoupdate.strategy = "latest_github_release" autoupdate.asset = "grocy_.*.zip" @@ -60,4 +60,4 @@ ram.runtime = "50M" api.protected = true [resources.apt] - packages = "php8.1-ldap php8.1-mbstring php8.1-fileinfo php8.1-sqlite3 php8.1-gd php8.1-intl" + packages = "php8.2-ldap php8.2-mbstring php8.2-fileinfo php8.2-sqlite3 php8.2-gd php8.2-intl" From 981395866c6b56840a3676ee519ee2f7bc97d294 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 6 Aug 2023 14:02:20 +0000 Subject: [PATCH 05/27] 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 424da53..c341061 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 grocy is a web-based self-hosted groceries & household management solution for your home. -**Shipped version:** 4.0.0~ynh3 +**Shipped version:** 4.0.1~ynh1 **Demo:** https://en.demo.grocy.info/stockoverview diff --git a/README_fr.md b/README_fr.md index 1ea95d5..18c621a 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 grocy is a web-based self-hosted groceries & household management solution for your home. -**Version incluse :** 4.0.0~ynh3 +**Version incluse :** 4.0.1~ynh1 **Démo :** https://en.demo.grocy.info/stockoverview From 928bebc79b6988c6f45153d7459787d2e783bb42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 6 Aug 2023 16:03:10 +0200 Subject: [PATCH 06/27] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 18e5198..0479dc6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -60,4 +60,4 @@ ram.runtime = "50M" api.protected = true [resources.apt] - packages = "php8.1-ldap php8.1-mbstring php8.1-fileinfo php8.1-sqlite3 php8.1-gd php8.1-intl" + packages = "php8.2-ldap php8.2-mbstring php8.2-fileinfo php8.2-sqlite3 php8.2-gd php8.2-intl" From 136989e8c3f03437794577438b6c7af4c46a908d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 12 Aug 2023 19:30:28 +0200 Subject: [PATCH 07/27] Update config-dist.php --- conf/config-dist.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/conf/config-dist.php b/conf/config-dist.php index 3a99aa0..3355c57 100644 --- a/conf/config-dist.php +++ b/conf/config-dist.php @@ -14,8 +14,9 @@ // The settings defined here below // Either "production", "dev", "demo" or "prerelease" -// When not "production", authentication will be disabled and -// demo data will be populated during database migrations +// When not "production", the application will work in a demo mode which means +// authentication is disabled and some demo data will be generated during the database schema migration +// (pass the query parameter "nodemodata", e.g. https://grocy.example.com/?nodemodata to skip that) Setting('MODE', 'production'); // The directory name of one of the available localization folders @@ -41,7 +42,11 @@ Setting('MEAL_PLAN_FIRST_DAY_OF_WEEK', ''); // ISO 4217 code of the currency ("USD", "EUR", "GBP", etc.) Setting('CURRENCY', 'EUR'); -// When running grocy in a subdirectory, this should be set to the relative path, otherwise empty +// Your preferred unit for energy +// E.g. "kcal" or "kJ" or something else (doesn't really matter, it's only used to display energy values) +Setting('ENERGY_UNIT', 'kcal'); + +// When running Grocy in a subdirectory, this should be set to the relative path, otherwise empty // It needs to be set to the part (of the URL) AFTER the document root, // if URL rewriting is disabled, including index.php // Example with URL Rewriting support: @@ -100,7 +105,7 @@ Setting('GROCYCODE_TYPE', '1D'); // Label printer settings -Setting('LABEL_PRINTER_WEBHOOK', ''); // The URI that grocy will POST to when asked to print a label +Setting('LABEL_PRINTER_WEBHOOK', ''); // The URI that Grocy will POST to when asked to print a label Setting('LABEL_PRINTER_RUN_SERVER', true); // Whether the webhook will be called server- or client-side Setting('LABEL_PRINTER_PARAMS', ['font_family' => 'Source Sans Pro (Regular)']); // Additional parameters supplied to the webhook Setting('LABEL_PRINTER_HOOK_JSON', false); // TRUE to use JSON or FALSE to use normal POST request variables @@ -140,6 +145,7 @@ Setting('FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING', true); Setting('FEATURE_FLAG_STOCK_PRODUCT_FREEZING', true); Setting('FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_NUMBER_PAD', true); // Activate the number pad in due date fields on (supported) mobile browsers Setting('FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS', true); +Setting('FEATURE_FLAG_RECIPES_MEALPLAN', true); Setting('FEATURE_FLAG_CHORES_ASSIGNMENTS', true); Setting('FEATURE_FLAG_THERMAL_PRINTER', false); From b47e59aebe02dc30f4346f64c85fdb606a12cba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 12 Aug 2023 19:30:46 +0200 Subject: [PATCH 08/27] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 0479dc6..6d38320 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Grocy" description.en = "Web-based groceries & household management solution for your home" description.fr = "Solution Web de gestion d'épicerie et de gestion de la maison" -version = "4.0.1~ynh1" +version = "4.0.1~ynh2" maintainers = ["eric_G"] From 2807c76baacce16bc7e45dfa01ed74c6612b46d8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 12 Aug 2023 17:30:51 +0000 Subject: [PATCH 09/27] 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 c341061..aeee9c8 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 grocy is a web-based self-hosted groceries & household management solution for your home. -**Shipped version:** 4.0.1~ynh1 +**Shipped version:** 4.0.1~ynh2 **Demo:** https://en.demo.grocy.info/stockoverview diff --git a/README_fr.md b/README_fr.md index 18c621a..5d96bd1 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 grocy is a web-based self-hosted groceries & household management solution for your home. -**Version incluse :** 4.0.1~ynh1 +**Version incluse :** 4.0.1~ynh2 **Démo :** https://en.demo.grocy.info/stockoverview From 8b9dc63e17306a05c0877b8df5af17c427d5e71b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 18 Aug 2023 11:31:41 +0200 Subject: [PATCH 10/27] Update manifest.toml --- manifest.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 6d38320..236380b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -27,7 +27,6 @@ ram.runtime = "50M" [install] [install.domain] type = "domain" - full_domain = true [install.language] ask.en = "Choose the application language" From ed28eca352c124f4bc93c8d38624c65ad7b0177c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 19 Aug 2023 11:39:38 +0200 Subject: [PATCH 11/27] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 236380b..d8e5160 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Grocy" description.en = "Web-based groceries & household management solution for your home" description.fr = "Solution Web de gestion d'épicerie et de gestion de la maison" -version = "4.0.1~ynh2" +version = "4.0.2~ynh1" maintainers = ["eric_G"] @@ -41,8 +41,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/grocy/grocy/releases/download/v4.0.1/grocy_4.0.1.zip" - sha256 = "1deb09382eef102b591c4500b68e4027829dbb21d71ae8637b692daa5ec33a09" + url = "https://github.com/grocy/grocy/releases/download/v4.0.2/grocy_4.0.2.zip" + sha256 = "6615df64a99f83c952cc4006223ecb3087ef6871b5158e63fbf3a93824f19b77" in_subdir = false autoupdate.strategy = "latest_github_release" autoupdate.asset = "grocy_.*.zip" From 9b6e63adab398046103e60f01407459c5a0f9f8e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 19 Aug 2023 09:39:42 +0000 Subject: [PATCH 12/27] 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 aeee9c8..2d4a037 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 grocy is a web-based self-hosted groceries & household management solution for your home. -**Shipped version:** 4.0.1~ynh2 +**Shipped version:** 4.0.2~ynh1 **Demo:** https://en.demo.grocy.info/stockoverview diff --git a/README_fr.md b/README_fr.md index 5d96bd1..40b8904 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 grocy is a web-based self-hosted groceries & household management solution for your home. -**Version incluse :** 4.0.1~ynh2 +**Version incluse :** 4.0.2~ynh1 **Démo :** https://en.demo.grocy.info/stockoverview From 0253412965cb29193ee87ecf0c62fcefc80b31e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 2 Sep 2023 12:11:31 +0200 Subject: [PATCH 13/27] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index d8e5160..79dbfd9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Grocy" description.en = "Web-based groceries & household management solution for your home" description.fr = "Solution Web de gestion d'épicerie et de gestion de la maison" -version = "4.0.2~ynh1" +version = "4.0.3~ynh1" maintainers = ["eric_G"] From baaf3c44ba906e297591c53cb21294634fd9641f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 2 Sep 2023 10:11:35 +0000 Subject: [PATCH 14/27] 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 2d4a037..50d7038 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 grocy is a web-based self-hosted groceries & household management solution for your home. -**Shipped version:** 4.0.2~ynh1 +**Shipped version:** 4.0.3~ynh1 **Demo:** https://en.demo.grocy.info/stockoverview diff --git a/README_fr.md b/README_fr.md index 40b8904..b34a9c8 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 grocy is a web-based self-hosted groceries & household management solution for your home. -**Version incluse :** 4.0.2~ynh1 +**Version incluse :** 4.0.3~ynh1 **Démo :** https://en.demo.grocy.info/stockoverview From b6b3e4e62858fd7d9d36e8515f4435f3854ebe5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 2 Sep 2023 12:12:31 +0200 Subject: [PATCH 15/27] Update manifest.toml --- manifest.toml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/manifest.toml b/manifest.toml index 79dbfd9..ee668f5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -24,25 +24,27 @@ sso = false disk = "50M" ram.build = "50M" ram.runtime = "50M" + [install] + [install.domain] type = "domain" - [install.language] - ask.en = "Choose the application language" - ask.fr = "Choisissez la langue de l'application" - type = "string" - choices = ["de", "en", "es", "fr", "it", "pt"] - default = "fr" - [install.init_main_permission] type = "group" default = "visitors" + + [install.language] + ask.en = "Choose the application language" + ask.fr = "Choisissez la langue de l'application" + type = "select" + choices = ["de", "en", "es", "fr", "it", "pt"] + default = "fr" [resources] [resources.sources.main] - url = "https://github.com/grocy/grocy/releases/download/v4.0.2/grocy_4.0.2.zip" - sha256 = "6615df64a99f83c952cc4006223ecb3087ef6871b5158e63fbf3a93824f19b77" + url = "https://github.com/grocy/grocy/releases/download/v4.0.3/grocy_4.0.3.zip" + sha256 = "2814ec8badf84a8960034d5e46d84cb96c7b0c817bae1bc948fc621f2b8a491f" in_subdir = false autoupdate.strategy = "latest_github_release" autoupdate.asset = "grocy_.*.zip" From 9ec98aaee803ccd2e1c042facacb00a196ba44a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 2 Sep 2023 19:12:37 +0200 Subject: [PATCH 16/27] Update upgrade --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index a37bf05..7281fd3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -48,6 +48,7 @@ then # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" --keep="data" + ynh_secure_remove --file="$install_dir/data/viewcache/*" fi chmod -R o-rwx "$install_dir" From 96dbfdfbc6c476ca652ca6edafcff7441a0e3928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 2 Sep 2023 19:12:48 +0200 Subject: [PATCH 17/27] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index ee668f5..799dc9f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Grocy" description.en = "Web-based groceries & household management solution for your home" description.fr = "Solution Web de gestion d'épicerie et de gestion de la maison" -version = "4.0.3~ynh1" +version = "4.0.3~ynh2" maintainers = ["eric_G"] From 34d4efa5c0527281a5942eea32454c9ba044c70a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 2 Sep 2023 17:12:52 +0000 Subject: [PATCH 18/27] 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 50d7038..bb9dfef 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 grocy is a web-based self-hosted groceries & household management solution for your home. -**Shipped version:** 4.0.3~ynh1 +**Shipped version:** 4.0.3~ynh2 **Demo:** https://en.demo.grocy.info/stockoverview diff --git a/README_fr.md b/README_fr.md index b34a9c8..6156790 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 grocy is a web-based self-hosted groceries & household management solution for your home. -**Version incluse :** 4.0.3~ynh1 +**Version incluse :** 4.0.3~ynh2 **Démo :** https://en.demo.grocy.info/stockoverview From 118be556924921a6af010fb7a918da7ab32bc920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 9 Dec 2023 22:05:03 +0100 Subject: [PATCH 19/27] cleaning --- scripts/install | 7 +------ scripts/remove | 5 ----- scripts/restore | 8 -------- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/scripts/install b/scripts/install index df3a810..0958a64 100644 --- a/scripts/install +++ b/scripts/install @@ -44,11 +44,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=10 # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring PHP-FPM..." --weight=3 - # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint @@ -57,7 +52,7 @@ ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/config-dist.php" --destination="$install_dir/data/config.php" +ynh_add_config --template="config-dist.php" --destination="$install_dir/data/config.php" chmod 400 "$install_dir/data/config.php" chown $app "$install_dir/data/config.php" diff --git a/scripts/remove b/scripts/remove index 4993569..61db822 100644 --- a/scripts/remove +++ b/scripts/remove @@ -17,11 +17,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=2 - # Remove the dedicated PHP-FPM config ynh_remove_fpm_config diff --git a/scripts/restore b/scripts/restore index 9363d25..17456e3 100644 --- a/scripts/restore +++ b/scripts/restore @@ -27,14 +27,6 @@ ynh_script_progression --message="Restoring PHP-FPM configuration..." --weight=1 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -# Recreate a dedicated php-fpm config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion - -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1 - ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= From 7a84d4dcf47f6f6df966630c5c69ac76022ffb98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 21 Dec 2023 14:36:33 +0100 Subject: [PATCH 20/27] Update manifest.toml --- manifest.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 799dc9f..8a921af 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,8 +19,11 @@ code = "https://github.com/grocy/grocy" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = true + sso = false + disk = "50M" ram.build = "50M" ram.runtime = "50M" @@ -61,4 +64,4 @@ ram.runtime = "50M" api.protected = true [resources.apt] - packages = "php8.2-ldap php8.2-mbstring php8.2-fileinfo php8.2-sqlite3 php8.2-gd php8.2-intl" + packages = "php8.2-ldap, php8.2-mbstring, php8.2-fileinfo, php8.2-sqlite3, php8.2-gd, php8.2-intl" From ac115d177102f330cefb2120df2524540f1b8ecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 21 Dec 2023 14:41:46 +0100 Subject: [PATCH 21/27] cleaning --- scripts/install | 3 --- scripts/remove | 2 -- scripts/upgrade | 10 +--------- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/scripts/install b/scripts/install index 0958a64..711ba42 100644 --- a/scripts/install +++ b/scripts/install @@ -30,7 +30,6 @@ ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage #================================================= ynh_script_progression --message="Setting up source files..." --weight=1 -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" chmod -R o-rwx "$install_dir" @@ -41,10 +40,8 @@ chown -R $app:www-data "$install_dir" #================================================= ynh_script_progression --message="Configuring NGINX web server..." --weight=10 -# Create a dedicated NGINX config ynh_add_nginx_config -# Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint #================================================= diff --git a/scripts/remove b/scripts/remove index 61db822..ac762c0 100644 --- a/scripts/remove +++ b/scripts/remove @@ -14,10 +14,8 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 -# Remove the dedicated NGINX config ynh_remove_nginx_config -# Remove the dedicated PHP-FPM config ynh_remove_fpm_config #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 7281fd3..b15c0a5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -46,7 +46,6 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=5 - # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" --keep="data" ynh_secure_remove --file="$install_dir/data/viewcache/*" fi @@ -59,17 +58,10 @@ chown -R $app:www-data "$install_dir" #================================================= ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 -# Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 - # Create a dedicated php-fpm config -ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint #================================================= # MODIFY A CONFIG FILE From 21dbcc1426f60a1f36c607b7f02eca752474c82b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 9 Feb 2024 18:59:03 +0100 Subject: [PATCH 22/27] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 8a921af..e5c7390 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Grocy" description.en = "Web-based groceries & household management solution for your home" description.fr = "Solution Web de gestion d'épicerie et de gestion de la maison" -version = "4.0.3~ynh2" +version = "4.1.0~ynh1" maintainers = ["eric_G"] @@ -46,8 +46,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/grocy/grocy/releases/download/v4.0.3/grocy_4.0.3.zip" - sha256 = "2814ec8badf84a8960034d5e46d84cb96c7b0c817bae1bc948fc621f2b8a491f" + url = "https://github.com/grocy/grocy/releases/download/v4.1.0/grocy_4.1.0.zip" + sha256 = "638ac71603e614770dac44e5bcc2d74abd2fd3ba761b37e32752631f66065e85" in_subdir = false autoupdate.strategy = "latest_github_release" autoupdate.asset = "grocy_.*.zip" From d5ce2971a459fb99787e01ce0f4e7e0179c1f36e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 9 Feb 2024 17:59:07 +0000 Subject: [PATCH 23/27] 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 00ab7e0..c210b6d 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 grocy is a web-based self-hosted groceries & household management solution for your home. -**Shipped version:** 4.0.3~ynh2 +**Shipped version:** 4.1.0~ynh1 **Demo:** https://en.demo.grocy.info/stockoverview diff --git a/README_fr.md b/README_fr.md index d0f9b08..26c1c39 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 grocy is a web-based self-hosted groceries & household management solution for your home. -**Version incluse :** 4.0.3~ynh2 +**Version incluse :** 4.1.0~ynh1 **Démo :** https://en.demo.grocy.info/stockoverview From de0af608e140f8bd59570a03924e4ab32f03e39f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 14 Feb 2024 10:33:34 +0100 Subject: [PATCH 24/27] remove maintenance --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index e5c7390..a1db796 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ description.fr = "Solution Web de gestion d'épicerie et de gestion de la maison version = "4.1.0~ynh1" -maintainers = ["eric_G"] +maintainers = [""] [upstream] license = "MIT" From ea016873d3e7785a819baec09d1f84e0ba3148f3 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Tue, 19 Mar 2024 23:01:55 +0100 Subject: [PATCH 25/27] Upgrade to v4.2.0 (#70) * Upgrade to v4.2.0 https://github.com/grocy/grocy/releases/tag/v4.2.0 * Auto-update README --- README.md | 17 ++++++++--------- README_fr.md | 19 +++++++++---------- manifest.toml | 6 +++--- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index c210b6d..42686cc 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -17,10 +17,9 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview grocy is a web-based self-hosted groceries & household management solution for your home. +**Shipped version:** 4.2.0~ynh1 -**Shipped version:** 4.1.0~ynh1 - -**Demo:** https://en.demo.grocy.info/stockoverview +**Demo:** ## Screenshots @@ -28,10 +27,10 @@ grocy is a web-based self-hosted groceries & household management solution for y ## Documentation and resources -* Official app website: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## Developer info @@ -39,7 +38,7 @@ Please send your pull request to the [testing branch](https://github.com/YunoHos To try the testing branch, please proceed like that. -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/grocy_ynh/tree/testing --debug or sudo yunohost app upgrade grocy -u https://github.com/YunoHost-Apps/grocy_ynh/tree/testing --debug diff --git a/README_fr.md b/README_fr.md index 26c1c39..a62659e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,5 +1,5 @@ @@ -17,10 +17,9 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble grocy is a web-based self-hosted groceries & household management solution for your home. +**Version incluse :** 4.2.0~ynh1 -**Version incluse :** 4.1.0~ynh1 - -**Démo :** https://en.demo.grocy.info/stockoverview +**Démo :** ## Captures d’écran @@ -28,10 +27,10 @@ grocy is a web-based self-hosted groceries & household management solution for y ## Documentations et ressources -* Site officiel de l’app : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- Site officiel de l’app : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs @@ -39,10 +38,10 @@ Merci de faire vos pull request sur la [branche testing](https://github.com/Yuno Pour essayer la branche testing, procédez comme suit. -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/grocy_ynh/tree/testing --debug ou sudo yunohost app upgrade grocy -u https://github.com/YunoHost-Apps/grocy_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** diff --git a/manifest.toml b/manifest.toml index a1db796..b683693 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Grocy" description.en = "Web-based groceries & household management solution for your home" description.fr = "Solution Web de gestion d'épicerie et de gestion de la maison" -version = "4.1.0~ynh1" +version = "4.2.0~ynh1" maintainers = [""] @@ -46,8 +46,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/grocy/grocy/releases/download/v4.1.0/grocy_4.1.0.zip" - sha256 = "638ac71603e614770dac44e5bcc2d74abd2fd3ba761b37e32752631f66065e85" + url = "https://github.com/grocy/grocy/releases/download/v4.2.0/grocy_4.2.0.zip" + sha256 = "ddc8b5841f90d41f1ce93cf8bf9af58d7ee7e651b570559a323062eec9a79dd9" in_subdir = false autoupdate.strategy = "latest_github_release" autoupdate.asset = "grocy_.*.zip" From a301b9b237ca717f485fac02b590ddf167fa20f2 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Date: Sat, 6 Apr 2024 17:27:53 +0200 Subject: [PATCH 26/27] Update manifest.toml: empty string is not an actual maintainer --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index b683693..9586ec0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ description.fr = "Solution Web de gestion d'épicerie et de gestion de la maison version = "4.2.0~ynh1" -maintainers = [""] +maintainers = [] [upstream] license = "MIT" From 5ceacccbad2350cd3ae757c5717d162f5010f4f4 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 6 Apr 2024 15:27:56 +0000 Subject: [PATCH 27/27] Auto-update READMEs --- ALL_README.md | 6 ++++++ README.md | 13 +++++++------ README_eu.md | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 29 +++++++++++++++-------------- README_gl.md | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 124 insertions(+), 20 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_eu.md create mode 100644 README_gl.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..77b7509 --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,6 @@ +# All available README files by language + +- [Read the README in English](README.md) +- [Irakurri README euskaraz](README_eu.md) +- [Lire le README en français](README_fr.md) +- [Le o README en galego](README_gl.md) diff --git a/README.md b/README.md index 42686cc..08edc07 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,14 +9,15 @@ It shall NOT be edited by hand. [![Install Grocy with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=grocy) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README in other languages.](./ALL_README.md)* -> *This package allows you to install Grocy quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* +> *This package allows you to install Grocy quickly and simply on a YunoHost server.* +> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* ## Overview grocy is a web-based self-hosted groceries & household management solution for your home. + **Shipped version:** 4.2.0~ynh1 **Demo:** @@ -34,9 +35,9 @@ grocy is a web-based self-hosted groceries & household management solution for y ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/grocy_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/grocy_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: ```bash sudo yunohost app install https://github.com/YunoHost-Apps/grocy_ynh/tree/testing --debug diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..a9093ce --- /dev/null +++ b/README_eu.md @@ -0,0 +1,48 @@ + + +# Grocy YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/grocy.svg)](https://dash.yunohost.org/appci/app/grocy) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/grocy.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/grocy.maintain.svg) + +[![Instalatu Grocy YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=grocy) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Grocy YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +grocy is a web-based self-hosted groceries & household management solution for your home. + +**Paketatutako bertsioa:** 4.2.0~ynh1 + +**Demoa:** + +## Pantaila-argazkiak + +![Grocy(r)en pantaila-argazkia](./doc/screenshots/stock-en.png) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/grocy_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/grocy_ynh/tree/testing --debug +edo +sudo yunohost app upgrade grocy -u https://github.com/YunoHost-Apps/grocy_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index a62659e..84a357b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # Grocy pour YunoHost @@ -9,17 +9,18 @@ It shall NOT be edited by hand. [![Installer Grocy avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=grocy) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer Grocy rapidement et simplement sur un serveur YunoHost. -Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* +> *Ce package vous permet d’installer Grocy rapidement et simplement sur un serveur YunoHost.* +> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* ## Vue d’ensemble grocy is a web-based self-hosted groceries & household management solution for your home. -**Version incluse :** 4.2.0~ynh1 -**Démo :** +**Version incluse :** 4.2.0~ynh1 + +**Démo :** ## Captures d’écran @@ -27,16 +28,16 @@ grocy is a web-based self-hosted groceries & household management solution for y ## Documentations et ressources -- Site officiel de l’app : -- Dépôt de code officiel de l’app : -- YunoHost Store : -- Signaler un bug : +- Site officiel de l’app : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/grocy_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/grocy_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : ```bash sudo yunohost app install https://github.com/YunoHost-Apps/grocy_ynh/tree/testing --debug @@ -44,4 +45,4 @@ ou sudo yunohost app upgrade grocy -u https://github.com/YunoHost-Apps/grocy_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** +**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..7e3228f --- /dev/null +++ b/README_gl.md @@ -0,0 +1,48 @@ + + +# Grocy para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/grocy.svg)](https://dash.yunohost.org/appci/app/grocy) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/grocy.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/grocy.maintain.svg) + +[![Instalar Grocy con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=grocy) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar Grocy de xeito rápido e doado nun servidor YunoHost.* +> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* + +## Vista xeral + +grocy is a web-based self-hosted groceries & household management solution for your home. + +**Versión proporcionada:** 4.2.0~ynh1 + +**Demo:** + +## Capturas de pantalla + +![Captura de pantalla de Grocy](./doc/screenshots/stock-en.png) + +## Documentación e recursos + +- Web oficial da app: +- Repositorio de orixe do código: +- Tenda YunoHost: +- Informar dun problema: + +## Info de desenvolvemento + +Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/grocy_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/grocy_ynh/tree/testing --debug +ou +sudo yunohost app upgrade grocy -u https://github.com/YunoHost-Apps/grocy_ynh/tree/testing --debug +``` + +**Máis info sobre o empaquetado da app:**