From 6fbcfdbdcf76fe233694ee33febdb7fd4fe9ba39 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 25 Dec 2023 20:46:52 +0100 Subject: [PATCH] Testing (#88) * #39 * Update upgrade * Update manifest.json * Auto-update README * Update _common.sh * Update _common.sh * Cleaning up * Fix * Create DESCRIPTION.md * Auto-update README * Create updater.sh * Update updater.sh * Create updater.yml (#42) * Update upgrade * Update upgrade * Auto-update README * Update upgrade * Update upgrade * Apply example_ynh (#43) * Auto-update README * Apply example_ynh * Auto-update README * fix missing datadir * Fix missing phpversion * Update upgrade * Update check_process Co-authored-by: yunohost-bot * Auto-update README * 4.7.0 (#50) * 4.6.2 * Auto-update README * 4.7.0 * Auto-update README * Fix PHP * Update upgrade * Update restore * Update install * Update install * Update PHP to 8.1 * Update upgrade * Update install * Fix * Update ffprobe.patch * Update install * Update install * Update upgrade Co-authored-by: yunohost-bot * Upgrade auto-updater (#58) * [autopatch] Upgrade auto-updater * Auto-update README --------- Co-authored-by: tituspijean * Update .env.example * Version 2 (#61) * v2 * fix * v2 * Update manifest.toml * Auto-update README * Fix * Auto-update README * 4.7.2 * Auto-update README * Update install * Update manifest.toml * Update _common.sh * Update install * Update install * Update .env.example * Update install * Update install * Update install * Update install * Update install * Update install * Update install * Update install * Fix * Update install * Update install * Update .env.example * Update install * Update install * Update install * Update manifest.toml * Auto-update README * remove config panel * Update manifest.toml * Auto-update README * Update upgrade * Update manifest.toml * Auto-update README * Delete app.src * Update manifest.toml * Update manifest.toml * Auto-update README * add sudir (#68) * Update manifest.toml * Auto-update README * Update manifest.toml * Update install * Update manifest.toml * Auto-update README * Auto-update README * Update upgrade * Update manifest.toml * Auto-update README * Update manifest.toml * Auto-update README * Upgrade to v4.9.1 (#74) * Upgrade to v4.9.1 * Auto-update README * Update manifest.toml * Auto-update README * Update manifest.toml * Auto-update README * Update manifest.toml * Update manifest.toml * Auto-update README * Update manifest.toml * Auto-update README * fix * 4.11.0 * Auto-update README * Upgrade to v4.11.1 (#83) * Upgrade to v4.11.1 * Auto-update README * Auto-update README * Update manifest.toml * Update manifest.toml * Auto-update README * Upgrade to v4.13.0 (#86) * Upgrade to v4.13.0 * Auto-update README * no 32bit support * cleaning * Auto-update README * Update manifest.toml * Update manifest.toml * Auto-update README --------- Co-authored-by: yunohost-bot Co-authored-by: yalh76 Co-authored-by: YunoHost Bot Co-authored-by: tituspijean --- README.md | 4 ++-- README_fr.md | 5 +++-- doc/DESCRIPTION.md | 2 +- doc/DESCRIPTION_fr.md | 1 + manifest.toml | 10 ++++------ scripts/install | 12 ++---------- scripts/upgrade | 9 ++------- 7 files changed, 15 insertions(+), 28 deletions(-) create mode 100644 doc/DESCRIPTION_fr.md diff --git a/README.md b/README.md index 3de6695..bde5354 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,9 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Lychee is a free photo-management tool, which runs on your server or web-space. Installing is a matter of seconds. Upload, manage and share photos like from a native application. Lychee comes with everything you need and all your photos are stored securely. +Lychee is a free photo-management tool, which runs on your server or web-space. Upload, manage and share photos like from a native application. Lychee comes with everything you need and all your photos are stored securely. -**Shipped version:** 4.13.0~ynh1 +**Shipped version:** 5.0.0~ynh1 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index 10a01d9..4c445e2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,9 +16,10 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -Lychee is a free photo-management tool, which runs on your server or web-space. Installing is a matter of seconds. Upload, manage and share photos like from a native application. Lychee comes with everything you need and all your photos are stored securely. +Lychee est un outil de gestion de photos, qui s'exécute sur votre serveur ou espace Web. Téléchargez, gérez et partagez des photos comme à partir d'une application native. Lychee est livré avec tout ce dont vous avez besoin et toutes vos photos sont stockées en toute sécurité. -**Version incluse :** 4.13.0~ynh1 + +**Version incluse :** 5.0.0~ynh1 **Démo :** https://lycheeorg.github.io/demo/ diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 15ad17d..b9a1229 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1 +1 @@ -Lychee is a free photo-management tool, which runs on your server or web-space. Installing is a matter of seconds. Upload, manage and share photos like from a native application. Lychee comes with everything you need and all your photos are stored securely. \ No newline at end of file +Lychee is a free photo-management tool, which runs on your server or web-space. Upload, manage and share photos like from a native application. Lychee comes with everything you need and all your photos are stored securely. \ No newline at end of file diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..9eec097 --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1 @@ +Lychee est un outil de gestion de photos, qui s'exécute sur votre serveur ou espace Web. Téléchargez, gérez et partagez des photos comme à partir d'une application native. Lychee est livré avec tout ce dont vous avez besoin et toutes vos photos sont stockées en toute sécurité. diff --git a/manifest.toml b/manifest.toml index 9b5bab4..605929d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Lychee" description.en = "Photo-management-system to manage and share photos" description.fr = "Système de gestion de photos pour gérer et partager des photos" -version = "4.13.0~ynh1" +version = "5.0.0~ynh1" maintainers = ["eric_G"] @@ -18,7 +18,7 @@ code = "https://github.com/LycheeOrg/Lychee" [integration] yunohost = ">= 11.2" -architectures = "all" +architectures = ["arm64", "amd64"] multi_instance = true ldap = false sso = false @@ -35,8 +35,6 @@ ram.runtime = "50M" default = "/lychee" [install.init_main_permission] - help.en = "If enabled, Lychee will be accessible by people who do not have an account. This can be changed later via the webadmin." - help.fr = "Si cette case est cochée, Lychee sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." type = "group" default = "visitors" @@ -45,8 +43,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v4.13.0.tar.gz" - sha256 = "6587eb628bdd5ac40f70ed78c77f984b6261a1efb62627981ce928c9e4c8386c" + url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v5.0.0.tar.gz" + sha256 = "fcb37968c63725f0dc9331e88070a568a6d795580bb3a6525ec3edab81672dfc" autoupdate.strategy = "latest_github_tag" [resources.system_user] diff --git a/scripts/install b/scripts/install index 913aeb2..5207195 100755 --- a/scripts/install +++ b/scripts/install @@ -49,11 +49,6 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 - # Create a dedicated NGINX config ynh_add_nginx_config @@ -64,9 +59,6 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Creating a data directory..." --weight=1 -#mkdir -p $data_dir/uploads -#mkdir -p $data_dir/uploads/{big,import,medium,raw,small,thumb} - chgrp $app -R $install_dir/storage $install_dir/public/dist $install_dir/public/sym $data_dir/uploads chmod -R 2775 $install_dir/storage/* $install_dir/app/* $install_dir/public/dist $install_dir/public/sym $data_dir/uploads $install_dir/bootstrap/ @@ -82,7 +74,7 @@ ynh_install_composer #================================================= ynh_script_progression --message="Adding a configuration file..." -ynh_add_config --template="../conf/.env.example" --destination="$install_dir/.env" +ynh_add_config --template=".env.example" --destination="$install_dir/.env" chmod 400 "$install_dir/.env" chown $app:$app "$install_dir/.env" @@ -100,7 +92,7 @@ pushd $install_dir popd # Setup custom user.css file -ynh_add_config --template="../conf/user.css.example" --destination="$install_dir/public/dist/user.css" +ynh_add_config --template="user.css.example" --destination="$install_dir/public/dist/user.css" #================================================= # END OF SCRIPT diff --git a/scripts/upgrade b/scripts/upgrade index 4169774..afe1053 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -63,12 +63,7 @@ chmod -R 755 $data_dir ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint - -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint # Create a dedicated NGINX config ynh_add_nginx_config @@ -80,7 +75,7 @@ ynh_add_nginx_config #================================================= #ynh_script_progression --message="Updating a configuration file..." -#ynh_add_config --template="../conf/.env.example" --destination="$install_dir/.env" +#ynh_add_config --template=".env.example" --destination="$install_dir/.env" #chmod 400 "$install_dir/.env" #chown $app:$app "$install_dir/.env"