From 18135c5e1d102a786d4e8562318131524d272a59 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 6 Apr 2024 15:29:24 +0000 Subject: [PATCH 1/7] Auto-update READMEs --- ALL_README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ALL_README.md b/ALL_README.md index 332d266..77b7509 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,6 +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) -- [Leggi il “README” in italiano](README_it.md) \ No newline at end of file From d4a3e03fa0a0bff1710fa559dbe3a345efe947e2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 1 Jun 2024 23:02:47 +0200 Subject: [PATCH 2/7] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 9586ec0..8e9686d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -20,7 +20,7 @@ yunohost = ">= 11.2" architectures = "all" multi_instance = true -ldap = true +ldap = false sso = false From c41b6ef98eb97d449106e6ffec54c6be579e4cf8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 1 Jun 2024 21:02:52 +0000 Subject: [PATCH 3/7] Auto-update READMEs --- ALL_README.md | 2 ++ README_es.md | 48 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+) create mode 100644 README_es.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md index 77b7509..152f2e7 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,6 +1,8 @@ # All available README files by language - [Read the README in English](README.md) +- [Lea el README en español](README_es.md) - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) +- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README_es.md b/README_es.md new file mode 100644 index 0000000..c8fd9e3 --- /dev/null +++ b/README_es.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 funcional](https://ci-apps.yunohost.org/ci/badges/grocy.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/grocy.maintain.svg) + +[![Instalar Grocy con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=grocy) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarGrocy rapidamente y simplement en un servidor YunoHost.* +> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.* + +## Descripción general + +grocy is a web-based self-hosted groceries & household management solution for your home. + +**Versión actual:** 4.2.0~ynh1 + +**Demo:** + +## Capturas + +![Captura de Grocy](./doc/screenshots/stock-en.png) + +## Documentaciones y recursos + +- Sitio web oficial: +- Repositorio del código fuente oficial de la aplicación : +- Catálogo YunoHost: +- Reportar un error: + +## Información para desarrolladores + +Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/grocy_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/grocy_ynh/tree/testing --debug +o +sudo yunohost app upgrade grocy -u https://github.com/YunoHost-Apps/grocy_ynh/tree/testing --debug +``` + +**Mas informaciones sobre el empaquetado de aplicaciones:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..417ad5c --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,48 @@ + + +# YunoHost 上的 Grocy + +[![集成程度](https://dash.yunohost.org/integration/grocy.svg)](https://dash.yunohost.org/appci/app/grocy) ![工作状态](https://ci-apps.yunohost.org/ci/badges/grocy.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/grocy.maintain.svg) + +[![使用 YunoHost 安装 Grocy](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=grocy) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Grocy。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +grocy is a web-based self-hosted groceries & household management solution for your home. + +**分发版本：** 4.2.0~ynh1 + +**演示：** + +## 截图 + +![Grocy 的截图](./doc/screenshots/stock-en.png) + +## 文档与资源 + +- 官方应用网站： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/grocy_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/grocy_ynh/tree/testing --debug +或 +sudo yunohost app upgrade grocy -u https://github.com/YunoHost-Apps/grocy_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：** From cc401d5d3b14d5c18625945e3ab482aae1095b83 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 1 Jun 2024 23:05:37 +0200 Subject: [PATCH 4/7] cleaning --- scripts/backup | 4 ---- scripts/install | 18 +----------------- scripts/upgrade | 43 +++++-------------------------------------- 3 files changed, 6 insertions(+), 59 deletions(-) diff --git a/scripts/backup b/scripts/backup index 6854aaa..e2e0c78 100644 --- a/scripts/backup +++ b/scripts/backup @@ -27,10 +27,6 @@ ynh_backup --src_path="$install_dir" ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP THE PHP-FPM CONFIGURATION -#================================================= - ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= diff --git a/scripts/install b/scripts/install index 711ba42..c8629ee 100644 --- a/scripts/install +++ b/scripts/install @@ -9,22 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -fpm_footprint="low" -fpm_free_footprint=0 -fpm_usage="low" - -#================================================= -# STORE SETTINGS FROM MANIFEST -#================================================= - -ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint -ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint -ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -42,7 +26,7 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=10 ynh_add_nginx_config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config #================================================= # MODIFY A CONFIG FILE diff --git a/scripts/upgrade b/scripts/upgrade index b15c0a5..c78fc96 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,46 +9,13 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 - -# If fpm_footprint doesn't exist, create it -if [ -z "${fpm_footprint:-}" ]; then - fpm_footprint=low - ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint -fi - -# If fpm_free_footprint doesn't exist, create it -if [ -z "${fpm_free_footprint:-}" ]; then - fpm_free_footprint=0 - ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint -fi - -# If fpm_usage doesn't exist, create it -if [ -z "${fpm_usage:-}" ]; then - fpm_usage=low - ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage -fi - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=5 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=5 - - ynh_setup_source --dest_dir="$install_dir" --keep="data" - ynh_secure_remove --file="$install_dir/data/viewcache/*" -fi +ynh_setup_source --dest_dir="$install_dir" --keep="data" +ynh_secure_remove --file="$install_dir/data/viewcache/*" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -61,13 +28,13 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - ynh_add_nginx_config # Create a dedicated php-fpm config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config #================================================= # MODIFY A CONFIG FILE #================================================= -#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" From 7775de0dee0257e62e337c1e2d0bccfb99ffe8ab Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 1 Jun 2024 23:07:05 +0200 Subject: [PATCH 5/7] remove config panel --- config_panel.toml => config_panel.toml.example | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename config_panel.toml => config_panel.toml.example (100%) diff --git a/config_panel.toml b/config_panel.toml.example similarity index 100% rename from config_panel.toml rename to config_panel.toml.example From e1f1103d4402507fe16416cff5ba431e612cb7e8 Mon Sep 17 00:00:00 2001 From: spaced Date: Mon, 24 Jun 2024 01:50:33 -0700 Subject: [PATCH 6/7] Enable LDAP (#72) * Allow for LDAP authentication * Change filter --------- Co-authored-by: ericgaspar --- conf/config-dist.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/config-dist.php b/conf/config-dist.php index 3355c57..511bc3f 100644 --- a/conf/config-dist.php +++ b/conf/config-dist.php @@ -81,7 +81,7 @@ Setting('DISABLE_AUTH', false); // Either "Grocy\Middleware\DefaultAuthMiddleware", "Grocy\Middleware\ReverseProxyAuthMiddleware" // or any class that implements Grocy\Middleware\AuthMiddleware -Setting('AUTH_CLASS', 'Grocy\Middleware\DefaultAuthMiddleware'); +Setting('AUTH_CLASS', 'Grocy\Middleware\LdapAuthMiddleware'); // Options when using ReverseProxyAuthMiddleware Setting('REVERSE_PROXY_AUTH_HEADER', 'REMOTE_USER'); // The name of the HTTP header which your reverse proxy uses to pass the username (on successful authentication) @@ -92,8 +92,8 @@ Setting('LDAP_ADDRESS', 'ldap://127.0.0.1:389'); // Example value "ldap://vm-dc2 Setting('LDAP_BASE_DN', 'ou=users,dc=yunohost,dc=org'); // Example value "DC=local,DC=berrnd,DC=net" Setting('LDAP_BIND_DN', ''); // Example value "CN=grocy_bind_account,OU=service_accounts,DC=local,DC=berrnd,DC=net" Setting('LDAP_BIND_PW', ''); // Password for the above account -Setting('LDAP_USER_FILTER', ''); // Example value "(OU=grocy_users)" -Setting('LDAP_UID_ATTR', ''); // Windows AD: "sAMAccountName", OpenLDAP: "uid", GLAuth: "cn" +Setting('LDAP_USER_FILTER', '(&(|(objectclass=posixAccount))(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org))'); // Example value "(OU=grocy_users)" +Setting('LDAP_UID_ATTR', 'uid'); // Windows AD: "sAMAccountName", OpenLDAP: "uid", GLAuth: "cn" // Default permissions for new users // the array needs to contain the technical/constant names From ef3b0390aa39121ebd25264152aa3cf6afb5544c Mon Sep 17 00:00:00 2001 From: Salamandar <6552989+Salamandar@users.noreply.github.com> Date: Mon, 24 Jun 2024 10:51:10 +0200 Subject: [PATCH 7/7] [autopatch] TEST BEFORE MERGE ynh_setup_source --full_replace=1 (#69) * [autopatch] TEST BEFORE MERGE ynh_setup_source --full_replace=1 * Auto-update README * Auto-update READMEs --------- Co-authored-by: Yunohost-Bot <> Co-authored-by: eric_G <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index c78fc96..e0a2ebf 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -14,7 +14,7 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Upgrading source files..." --weight=5 -ynh_setup_source --dest_dir="$install_dir" --keep="data" +ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="data" ynh_secure_remove --file="$install_dir/data/viewcache/*" chmod -R o-rwx "$install_dir"