From 27b0f3d4af94143057adaef7084cf1c8fb721386 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 9 Feb 2024 20:25:18 +0100 Subject: [PATCH] Testing (#67) * Update manifest.toml * Update manifest.toml * Auto-update README * Update manifest.toml * Auto-update README * Update manifest.toml * Update config-dist.php * Update manifest.toml * Auto-update README * Update manifest.toml * Update manifest.toml * Auto-update README * Update manifest.toml * Auto-update README * Update manifest.toml * Update upgrade * Update manifest.toml * Auto-update README * cleaning * Update manifest.toml * cleaning * Update manifest.toml * Auto-update README --------- Co-authored-by: Tagada <36127788+Tagadda@users.noreply.github.com> Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 11 +++++++---- scripts/install | 10 +--------- scripts/remove | 7 ------- scripts/restore | 8 -------- scripts/upgrade | 10 +--------- 7 files changed, 11 insertions(+), 39 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 diff --git a/manifest.toml b/manifest.toml index 799dc9f..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"] @@ -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" @@ -43,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" @@ -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" diff --git a/scripts/install b/scripts/install index df3a810..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,15 +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 -#================================================= -# 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 +49,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..ac762c0 100644 --- a/scripts/remove +++ b/scripts/remove @@ -14,15 +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 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" #================================================= 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