1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/grocy_ynh.git synced 2024-09-03 19:25:54 +02:00
* 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 <yunohost@yunohost.org>
This commit is contained in:
eric_G 2024-02-09 20:25:18 +01:00 committed by GitHub
parent cc8cc31146
commit 27b0f3d4af
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 11 additions and 39 deletions

View file

@ -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. 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 **Demo:** https://en.demo.grocy.info/stockoverview

View file

@ -18,7 +18,7 @@ Si vous navez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
grocy is a web-based self-hosted groceries & household management solution for your home. 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 **Démo :** https://en.demo.grocy.info/stockoverview

View file

@ -5,7 +5,7 @@ name = "Grocy"
description.en = "Web-based groceries & household management solution for your home" 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" 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"] maintainers = ["eric_G"]
@ -19,8 +19,11 @@ code = "https://github.com/grocy/grocy"
yunohost = ">= 11.2" yunohost = ">= 11.2"
architectures = "all" architectures = "all"
multi_instance = true multi_instance = true
ldap = true ldap = true
sso = false sso = false
disk = "50M" disk = "50M"
ram.build = "50M" ram.build = "50M"
ram.runtime = "50M" ram.runtime = "50M"
@ -43,8 +46,8 @@ ram.runtime = "50M"
[resources] [resources]
[resources.sources.main] [resources.sources.main]
url = "https://github.com/grocy/grocy/releases/download/v4.0.3/grocy_4.0.3.zip" url = "https://github.com/grocy/grocy/releases/download/v4.1.0/grocy_4.1.0.zip"
sha256 = "2814ec8badf84a8960034d5e46d84cb96c7b0c817bae1bc948fc621f2b8a491f" sha256 = "638ac71603e614770dac44e5bcc2d74abd2fd3ba761b37e32752631f66065e85"
in_subdir = false in_subdir = false
autoupdate.strategy = "latest_github_release" autoupdate.strategy = "latest_github_release"
autoupdate.asset = "grocy_.*.zip" autoupdate.asset = "grocy_.*.zip"
@ -61,4 +64,4 @@ ram.runtime = "50M"
api.protected = true api.protected = true
[resources.apt] [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"

View file

@ -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 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" ynh_setup_source --dest_dir="$install_dir"
chmod -R o-rwx "$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 ynh_script_progression --message="Configuring NGINX web server..." --weight=10
# Create a dedicated NGINX config
ynh_add_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 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_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" chmod 400 "$install_dir/data/config.php"
chown $app "$install_dir/data/config.php" chown $app "$install_dir/data/config.php"

View file

@ -14,15 +14,8 @@ source /usr/share/yunohost/helpers
#================================================= #=================================================
ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
# Remove the dedicated NGINX config
ynh_remove_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 ynh_remove_fpm_config
#================================================= #=================================================

View file

@ -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" 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" ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
#================================================= #=================================================

View file

@ -46,7 +46,6 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
then then
ynh_script_progression --message="Upgrading source files..." --weight=5 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_setup_source --dest_dir="$install_dir" --keep="data"
ynh_secure_remove --file="$install_dir/data/viewcache/*" ynh_secure_remove --file="$install_dir/data/viewcache/*"
fi fi
@ -59,17 +58,10 @@ chown -R $app:www-data "$install_dir"
#================================================= #=================================================
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
# Create a dedicated NGINX config
ynh_add_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 # Create a dedicated php-fpm config
ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
#================================================= #=================================================
# MODIFY A CONFIG FILE # MODIFY A CONFIG FILE