From e14b7f54bb54295d46a0d4995e3936466f70c180 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 27 Jan 2022 09:34:54 +0100 Subject: [PATCH 001/112] #39 --- conf/php-fpm.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index ab1a471..676c75d 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -419,8 +419,8 @@ chdir = __FINALPATH__ ;php_admin_value[memory_limit] = 32M ; Common values to change to increase file upload limit -; php_admin_value[upload_max_filesize] = 50M -; php_admin_value[post_max_size] = 50M +php_admin_value[upload_max_filesize] = 100M +php_admin_value[post_max_size] = 100M ; php_admin_flag[mail.add_x_header] = Off ; Other common parameters From ca8029887f906e6c77650f2e49d7b2db2d74fcb8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 8 Feb 2022 20:10:15 +0100 Subject: [PATCH 002/112] Update upgrade --- scripts/upgrade | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index dbf9ab3..c2230fd 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -87,6 +87,13 @@ if ynh_legacy_permissions_exists; then ynh_app_setting_delete --app=$app --key=is_public fi +#================================================= +# UPGRADE DEPENDENCIES +#================================================= +ynh_script_progression --message="Upgrading dependencies..." --weight=6 + +ynh_install_app_dependencies $pkg_dependencies + #================================================= # CREATE DEDICATED USER #================================================= @@ -120,13 +127,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# UPGRADE DEPENDENCIES -#================================================= -ynh_script_progression --message="Upgrading dependencies..." --weight=6 - -ynh_install_app_dependencies $pkg_dependencies - #================================================= # PHP-FPM CONFIGURATION #================================================= From 1baca5d1165c9bd7a75325b5e797006a18df91b9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 29 Mar 2022 16:17:07 +0200 Subject: [PATCH 003/112] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 1935ea7..41b6235 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Photo-management-system to manage and share photos", "fr": "Système de gestion de photos pour gérer et partager des photos" }, - "version": "4.4~ynh2", + "version": "4.4~ynh3", "url": "https://lycheeorg.github.io/", "upstream": { "license": "MIT", From 93158c20dce02c10651bcd427f02cd21d3f010ec Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 29 Mar 2022 14:17:15 +0000 Subject: [PATCH 004/112] 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 c7dda7c..dc2b329 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Photo-management-system to manage and share photos -**Shipped version:** 4.4~ynh2 +**Shipped version:** 4.4~ynh3 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index 13cbe04..1737eea 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Système de gestion de photos pour gérer et partager des photos -**Version incluse :** 4.4~ynh2 +**Version incluse :** 4.4~ynh3 **Démo :** https://lycheeorg.github.io/demo/ From 1cbe50b57b1a963bda5aa4638235546460078d45 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 29 Mar 2022 16:18:03 +0200 Subject: [PATCH 005/112] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index cb4f793..1c39e06 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,7 @@ YNH_PHP_VERSION="8.0" # Composer version YNH_COMPOSER_VERSION="2.1.3" -pkg_dependencies="ffmpeg php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysqli php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-intl" +pkg_dependencies="ffmpeg php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysqli php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-intl" # # needed for raw upload and video playback # # ufraw-batch is not supported in bullseye From 6fbd55c7b5d1a00037c81a3e88333567582a186b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 29 Mar 2022 16:19:09 +0200 Subject: [PATCH 006/112] Update _common.sh --- scripts/_common.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 1c39e06..9e3bfe6 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -11,14 +11,6 @@ YNH_COMPOSER_VERSION="2.1.3" pkg_dependencies="ffmpeg php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysqli php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-intl" -# # needed for raw upload and video playback -# # ufraw-batch is not supported in bullseye -# if ! (apt-cache -q=0 show ufraw-batch |& grep ': No packages found' &>/dev/null); then -# pkg_dependencies="ffmpeg" -# else -# pkg_dependencies="ufraw-batch ffmpeg" -# fi - #================================================= # PERSONAL HELPERS #================================================= From dfe765cf812c221dc3d2387021bae533e028ca54 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 29 Mar 2022 16:23:37 +0200 Subject: [PATCH 007/112] Cleaning up --- conf/.env.example | 2 +- conf/extra_php-fpm.conf | 7 ------- conf/nginx.conf | 6 +----- conf/php-fpm.conf | 8 ++++---- scripts/install | 1 - 5 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 conf/extra_php-fpm.conf diff --git a/conf/.env.example b/conf/.env.example index 8d1f843..ebd3ac4 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -25,7 +25,7 @@ DB_CONNECTION=mysql DB_HOST=127.0.0.1 DB_PORT=3306 DB_DATABASE=__DB_NAME__ -DB_USERNAME=__DB_NAME__ +DB_USERNAME=__DB_USER__ DB_PASSWORD=__DB_PWD__ DB_LOG_SQL=false diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf deleted file mode 100644 index ad8b82c..0000000 --- a/conf/extra_php-fpm.conf +++ /dev/null @@ -1,7 +0,0 @@ -; Additional php.ini defines, specific to this pool of workers. - -php_admin_value[upload_max_filesize] = 512M -php_admin_value[post_max_size] = 512M -php_admin_value[memory_limit] = 256M -php_admin_value[post_max_size] = 512M -php_admin_value[max_execution_time] = 200 diff --git a/conf/nginx.conf b/conf/nginx.conf index 0009a71..466fd71 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,7 +2,7 @@ location ^~ __PATH__/ { # Path to source - alias __FINALPATH__/public/ ; + alias __FINALPATH__/public/; index index.php; @@ -32,7 +32,3 @@ location ^~ __PATH__/ { # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; } - -location @lychee { - rewrite __PATH__/(.*)$ __PATH__/index.php?/$1 last; -} diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 676c75d..a4d5b1e 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -419,12 +419,12 @@ chdir = __FINALPATH__ ;php_admin_value[memory_limit] = 32M ; Common values to change to increase file upload limit -php_admin_value[upload_max_filesize] = 100M -php_admin_value[post_max_size] = 100M +php_admin_value[upload_max_filesize] = 512M +php_admin_value[post_max_size] = 512M ; php_admin_flag[mail.add_x_header] = Off ; Other common parameters -; php_admin_value[max_execution_time] = 600 +php_admin_value[max_execution_time] = 200 ; php_admin_value[max_input_time] = 300 -; php_admin_value[memory_limit] = 256M +php_admin_value[memory_limit] = 256M ; php_admin_flag[short_open_tag] = On diff --git a/scripts/install b/scripts/install index e74cb54..b19f4ff 100755 --- a/scripts/install +++ b/scripts/install @@ -44,7 +44,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url -ynh_app_setting_set --app=$app --key=phpversion --value=$phpversion #================================================= # INSTALL DEPENDENCIES From f9078b755f1d97ca563cd0f2957e89812260596b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 16 May 2022 15:59:08 +0200 Subject: [PATCH 008/112] Fix --- scripts/_common.sh | 2 +- scripts/restore | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 9e3bfe6..472f72e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ YNH_PHP_VERSION="8.0" # Composer version -YNH_COMPOSER_VERSION="2.1.3" +YNH_COMPOSER_VERSION="2.3.5" pkg_dependencies="ffmpeg php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysqli php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-intl" diff --git a/scripts/restore b/scripts/restore index eee100f..8d87b27 100755 --- a/scripts/restore +++ b/scripts/restore @@ -96,7 +96,7 @@ ynh_script_progression --message="Restoring PHP-FPM configuration..." ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" # Recreate a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config #================================================= # RESTORE THE MYSQL DATABASE From 0aa0b4fa4e60b01a75b3d1acb9923e1ef75d6323 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 16 May 2022 16:00:42 +0200 Subject: [PATCH 009/112] Create DESCRIPTION.md --- doc/DESCRIPTION.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/DESCRIPTION.md diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..15ad17d --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +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 From 4c4a9e24f508efd8bb7e972fc92ce0b747f7e4ee Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 16 May 2022 14:00:51 +0000 Subject: [PATCH 010/112] 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 dc2b329..cbdafe5 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Photo-management-system to manage and share photos +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. **Shipped version:** 4.4~ynh3 diff --git a/README_fr.md b/README_fr.md index 1737eea..f9df8f2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Système de gestion de photos pour gérer et partager des photos +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. **Version incluse :** 4.4~ynh3 From 31226cbfdab2bab402f3a3a8e99a552f445068b8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 16 May 2022 16:01:36 +0200 Subject: [PATCH 011/112] Create updater.sh --- .github/workflows/updater.sh | 137 +++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) create mode 100755 .github/workflows/updater.sh diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh new file mode 100755 index 0000000..72eb5cb --- /dev/null +++ b/.github/workflows/updater.sh @@ -0,0 +1,137 @@ +#!/bin/bash + +#================================================= +# PACKAGE UPDATING HELPER +#================================================= + +# This script is meant to be run by GitHub Actions +# The YunoHost-Apps organisation offers a template Action to run this script periodically +# Since each app is different, maintainers can adapt its contents so as to perform +# automatic actions when a new upstream release is detected. + +# Remove this exit command when you are ready to run this Action +exit 1 + +#================================================= +# FETCHING LATEST RELEASE AND ITS ASSETS +#================================================= + +# Fetching information +current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') +repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]') +# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) +version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1) +assets=($(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '[ .[] | select(.tag_name=="'$version'").assets[].browser_download_url ] | join(" ") | @sh' | tr -d "'")) + +# Later down the script, we assume the version has only digits and dots +# Sometimes the release name starts with a "v", so let's filter it out. +# You may need more tweaks here if the upstream repository has different naming conventions. +if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then + version=${version:1} +fi + +# Setting up the environment variables +echo "Current version: $current_version" +echo "Latest release from upstream: $version" +echo "VERSION=$version" >> $GITHUB_ENV +echo "REPO=$repo" >> $GITHUB_ENV +# For the time being, let's assume the script will fail +echo "PROCEED=false" >> $GITHUB_ENV + +# Proceed only if the retrieved version is greater than the current one +if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then + echo "::warning ::No new version available" + exit 0 +# Proceed only if a PR for this new version does not already exist +elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then + echo "::warning ::A branch already exists for this update" + exit 0 +fi + +# Each release can hold multiple assets (e.g. binaries for different architectures, source code, etc.) +echo "${#assets[@]} available asset(s)" + +#================================================= +# UPDATE SOURCE FILES +#================================================= + +# Here we use the $assets variable to get the resources published in the upstream release. +# Here is an example for Grav, it has to be adapted in accordance with how the upstream releases look like. + +# Let's loop over the array of assets URLs +for asset_url in ${assets[@]}; do + +echo "Handling asset at $asset_url" + +# Assign the asset to a source file in conf/ directory +# Here we base the source file name upon a unique keyword in the assets url (admin vs. update) +# Leave $src empty to ignore the asset +case $asset_url in + *"admin"*) + src="app" + ;; + *"update"*) + src="app-upgrade" + ;; + *) + src="" + ;; +esac + +# If $src is not empty, let's process the asset +if [ ! -z "$src" ]; then + +# Create the temporary directory +tempdir="$(mktemp -d)" + +# Download sources and calculate checksum +filename=${asset_url##*/} +curl --silent -4 -L $asset_url -o "$tempdir/$filename" +checksum=$(sha256sum "$tempdir/$filename" | head -c 64) + +# Delete temporary directory +rm -rf $tempdir + +# Get extension +if [[ $filename == *.tar.gz ]]; then + extension=tar.gz +else + extension=${filename##*.} +fi + +# Rewrite source file +cat < conf/$src.src +SOURCE_URL=$asset_url +SOURCE_SUM=$checksum +SOURCE_SUM_PRG=sha256sum +SOURCE_FORMAT=$extension +SOURCE_IN_SUBDIR=true +SOURCE_FILENAME= +EOT +echo "... conf/$src.src updated" + +else +echo "... asset ignored" +fi + +done + +#================================================= +# SPECIFIC UPDATE STEPS +#================================================= + +# Any action on the app's source code can be done. +# The GitHub Action workflow takes care of committing all changes after this script ends. + +#================================================= +# GENERIC FINALIZATION +#================================================= + +# Replace new version in manifest +echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json + +# No need to update the README, yunohost-bot takes care of it + +# The Action will proceed only if the PROCEED environment variable is set to true +echo "PROCEED=true" >> $GITHUB_ENV +exit 0 From d3175c252ca862249e1210364b4ad5ca79835204 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 16 May 2022 16:02:35 +0200 Subject: [PATCH 012/112] Update updater.sh --- .github/workflows/updater.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 72eb5cb..01ddf32 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -10,7 +10,7 @@ # automatic actions when a new upstream release is detected. # Remove this exit command when you are ready to run this Action -exit 1 +#exit 1 #================================================= # FETCHING LATEST RELEASE AND ITS ASSETS @@ -67,7 +67,7 @@ echo "Handling asset at $asset_url" # Here we base the source file name upon a unique keyword in the assets url (admin vs. update) # Leave $src empty to ignore the asset case $asset_url in - *"admin"*) + *"Lychee.zip") src="app" ;; *"update"*) From e9c3a65f5691b97b15e3b20147898e75664ee8ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 16 May 2022 16:03:08 +0200 Subject: [PATCH 013/112] Create updater.yml (#42) --- .github/workflows/updater.yml | 50 +++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 .github/workflows/updater.yml diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml new file mode 100644 index 0000000..4363d38 --- /dev/null +++ b/.github/workflows/updater.yml @@ -0,0 +1,50 @@ +# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected. +# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization. +# This file should be enough by itself, but feel free to tune it to your needs. +# It calls updater.sh, which is where you should put the app-specific update steps. +name: Check for new upstream releases +on: + # Allow to manually trigger the workflow + workflow_dispatch: + # Run it every day at 6:00 UTC + schedule: + - cron: '0 6 * * *' +jobs: + updater: + runs-on: ubuntu-latest + steps: + - name: Fetch the source code + uses: actions/checkout@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + - name: Run the updater script + id: run_updater + run: | + # Setting up Git user + git config --global user.name 'yunohost-bot' + git config --global user.email 'yunohost-bot@users.noreply.github.com' + # Run the updater script + /bin/bash .github/workflows/updater.sh + - name: Commit changes + id: commit + if: ${{ env.PROCEED == 'true' }} + run: | + git commit -am "Upgrade to v$VERSION" + - name: Create Pull Request + id: cpr + if: ${{ env.PROCEED == 'true' }} + uses: peter-evans/create-pull-request@v3 + with: + token: ${{ secrets.GITHUB_TOKEN }} + commit-message: Update to version ${{ env.VERSION }} + committer: 'yunohost-bot ' + author: 'yunohost-bot ' + signoff: false + base: testing + branch: ci-auto-update-v${{ env.VERSION }} + delete-branch: true + title: 'Upgrade to version ${{ env.VERSION }}' + body: | + Upgrade to v${{ env.VERSION }} + [See upstream release page](https://github.com/${{ env.REPO }}/releases/tag/v${{ env.VERSION }}) + draft: false From fb764be9e5bdc01e2ebc525e868486de9f192b48 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 17 May 2022 07:26:27 +0200 Subject: [PATCH 014/112] Update upgrade --- scripts/upgrade | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index c2230fd..dbf9ab3 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -87,13 +87,6 @@ if ynh_legacy_permissions_exists; then ynh_app_setting_delete --app=$app --key=is_public fi -#================================================= -# UPGRADE DEPENDENCIES -#================================================= -ynh_script_progression --message="Upgrading dependencies..." --weight=6 - -ynh_install_app_dependencies $pkg_dependencies - #================================================= # CREATE DEDICATED USER #================================================= @@ -127,6 +120,13 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config +#================================================= +# UPGRADE DEPENDENCIES +#================================================= +ynh_script_progression --message="Upgrading dependencies..." --weight=6 + +ynh_install_app_dependencies $pkg_dependencies + #================================================= # PHP-FPM CONFIGURATION #================================================= From d8e40736829ea2b70f845e0b62a4b025b8593597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 16 Jun 2022 14:47:39 +0200 Subject: [PATCH 015/112] Update upgrade --- scripts/upgrade | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index dbf9ab3..3a02d1b 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -112,14 +112,6 @@ chmod 750 "$final_path/bootstrap/cache" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # UPGRADE DEPENDENCIES #================================================= @@ -135,6 +127,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config ynh_add_fpm_config +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # PHP-FPM CONFIGURATION #================================================= From a4c5be9bc9ef04f0b11abc35b9134e8ebd52181c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 16 Jun 2022 12:47:45 +0000 Subject: [PATCH 016/112] Auto-update README --- README.md | 19 ++++++++++--------- README_fr.md | 25 +++++++++++++++---------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index cbdafe5..e816a8a 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Lychee for YunoHost -[![Integration level](https://dash.yunohost.org/integration/lychee.svg)](https://dash.yunohost.org/appci/app/lychee) ![](https://ci-apps.yunohost.org/ci/badges/lychee.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/lychee.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/lychee.svg)](https://dash.yunohost.org/appci/app/lychee) ![Working status](https://ci-apps.yunohost.org/ci/badges/lychee.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/lychee.maintain.svg) [![Install Lychee with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lychee) *[Lire ce readme en français.](./README_fr.md)* @@ -23,25 +23,26 @@ Lychee is a free photo-management tool, which runs on your server or web-space. ## Screenshots -![](./doc/screenshots/screenshot.jpg) +![Screenshot of Lychee](./doc/screenshots/screenshot.jpg) ## Documentation and resources -* Official app website: https://lycheeorg.github.io/ -* Official admin documentation: https://lycheeorg.github.io/docs/ -* Upstream app code repository: https://github.com/LycheeOrg/Lychee -* YunoHost documentation for this app: https://yunohost.org/app_lychee -* Report a bug: https://github.com/YunoHost-Apps/lychee_ynh/issues +* Official app website: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/lychee_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/lychee_ynh/tree/testing --debug or sudo yunohost app upgrade lychee -u https://github.com/YunoHost-Apps/lychee_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index f9df8f2..7c83e90 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Lychee pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/lychee.svg)](https://dash.yunohost.org/appci/app/lychee) ![](https://ci-apps.yunohost.org/ci/badges/lychee.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/lychee.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/lychee.svg)](https://dash.yunohost.org/appci/app/lychee) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/lychee.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/lychee.maintain.svg) [![Installer Lychee avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lychee) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Lychee 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.* @@ -19,25 +23,26 @@ Lychee is a free photo-management tool, which runs on your server or web-space. ## Captures d'écran -![](./doc/screenshots/screenshot.jpg) +![Capture d'écran de Lychee](./doc/screenshots/screenshot.jpg) ## Documentations et ressources -* Site officiel de l'app : https://lycheeorg.github.io/ -* Documentation officielle de l'admin : https://lycheeorg.github.io/docs/ -* Dépôt de code officiel de l'app : https://github.com/LycheeOrg/Lychee -* Documentation YunoHost pour cette app : https://yunohost.org/app_lychee -* Signaler un bug : https://github.com/YunoHost-Apps/lychee_ynh/issues +* Site officiel de l'app : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/lychee_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/lychee_ynh/tree/testing --debug ou sudo yunohost app upgrade lychee -u https://github.com/YunoHost-Apps/lychee_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** From 48ba0a580e22b14e6e3da9f6258feaff7c2a7485 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 6 Aug 2022 08:55:50 +0200 Subject: [PATCH 017/112] Update upgrade --- scripts/upgrade | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 3a02d1b..dbf9ab3 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -112,6 +112,14 @@ chmod 750 "$final_path/bootstrap/cache" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # UPGRADE DEPENDENCIES #================================================= @@ -127,14 +135,6 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config ynh_add_fpm_config -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # PHP-FPM CONFIGURATION #================================================= From 0b6ab9de6c5f3ce63feb349599e1095c0a02003c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 6 Aug 2022 08:58:11 +0200 Subject: [PATCH 018/112] Update upgrade --- scripts/upgrade | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index dbf9ab3..3a02d1b 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -112,14 +112,6 @@ chmod 750 "$final_path/bootstrap/cache" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # UPGRADE DEPENDENCIES #================================================= @@ -135,6 +127,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config ynh_add_fpm_config +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # PHP-FPM CONFIGURATION #================================================= From 577b9b06352274e3aa5b7b43c24b62d1e9212d8c Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 7 Aug 2022 18:40:41 +0200 Subject: [PATCH 019/112] 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 --- README.md | 2 +- README_fr.md | 2 +- check_process | 11 ++----- conf/.env.example | 2 +- conf/app.src | 2 ++ conf/nginx.conf | 24 +++++++------- manifest.json | 16 +++++----- scripts/_common.sh | 1 + scripts/backup | 7 +++-- scripts/change_url | 13 ++++---- scripts/install | 66 +++++++++++++++++++++++---------------- scripts/remove | 28 ++++++++--------- scripts/restore | 37 +++++++++++----------- scripts/upgrade | 78 +++++++++++++++++++++++++--------------------- 14 files changed, 153 insertions(+), 136 deletions(-) diff --git a/README.md b/README.md index e816a8a..d6e84d0 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in 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. -**Shipped version:** 4.4~ynh3 +**Shipped version:** 4.4.0~ynh4 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index 7c83e90..ab477e6 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour 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. -**Version incluse :** 4.4~ynh3 +**Version incluse :** 4.4.0~ynh4 **Démo :** https://lycheeorg.github.io/demo/ diff --git a/check_process b/check_process index 6d7e474..e0e99ad 100644 --- a/check_process +++ b/check_process @@ -11,17 +11,12 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=2a2fd5b9a9e81ff8e157cf1747418fd11f4211a2 - upgrade=1 from_commit=1fa062d50aaa810deeba6426405fbe2e2671492a + # 4.4~ynh3 + upgrade=1 from_commit=a87e16f7ca7e6645610745970bc7c3daa263b2b7 backup_restore=1 multi_instance=1 + port_already_use=0 change_url=1 ;;; Options Email= Notification=none -;;; Upgrade options - ; commit=2a2fd5b9a9e81ff8e157cf1747418fd11f4211a2 - name= Fix linter (#13) 11 Dec 2020 - ; commit=1fa062d50aaa810deeba6426405fbe2e2671492a - name= Merge branch 'testing' (#26) - manifest_arg=domain=DOMAIN&path=PATH&is_public=1& diff --git a/conf/.env.example b/conf/.env.example index ebd3ac4..3be345a 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -33,7 +33,7 @@ TIMEZONE=UTC # folders in which the files will be stored LYCHEE_DIST="__FINALPATH__/public/dist/" -LYCHEE_UPLOADS="__PUBLIC_PATH__/uploads/" +LYCHEE_UPLOADS="__DATADIR__/uploads/" # url to access those files # LYCHEE_DIST_URL="dist/" diff --git a/conf/app.src b/conf/app.src index 2ba7af7..1d9e55d 100644 --- a/conf/app.src +++ b/conf/app.src @@ -3,3 +3,5 @@ SOURCE_SUM=2d451033e392e6c3287f8962524e9b4f5581d8e3dfcc9040690d2dc190274c26 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true +SOURCE_FILENAME= +SOURCE_EXTRACT=true diff --git a/conf/nginx.conf b/conf/nginx.conf index 466fd71..5527081 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -6,27 +6,27 @@ location ^~ __PATH__/ { index index.php; - # setup for image upload + # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file client_max_body_size 512M; try_files $uri $uri/ __PATH__/__PATH__/index.php?$query_string; location ~ \.php$ { - if (!-e $request_filename) { - rewrite ^__PATH__/?(.*)$ __PATH__/index.php?/$1 last; - break; - } - fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_param REMOTE_USER $remote_user; - fastcgi_param PATH_INFO $fastcgi_path_info; + if (!-e $request_filename) { + rewrite ^__PATH__/?(.*)$ __PATH__/index.php?/$1 last; + break; + } + fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param REMOTE_USER $remote_user; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param SCRIPT_FILENAME $request_filename; } location __PATH__/uploads/ { - alias __PUBLIC_PATH__/uploads/ ; + alias __DATADIR__/uploads/ ; } # Include SSOWAT user panel. diff --git a/manifest.json b/manifest.json index 41b6235..9a34178 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Photo-management-system to manage and share photos", "fr": "Système de gestion de photos pour gérer et partager des photos" }, - "version": "4.4~ynh3", + "version": "4.4.0~ynh4", "url": "https://lycheeorg.github.io/", "upstream": { "license": "MIT", @@ -30,20 +30,20 @@ "mysql" ], "arguments": { - "install" : [ + "install": [ { - "name": "domain", - "type": "domain" + "name": "domain", + "type": "domain" }, { - "name": "path", - "type": "path", + "name": "path", + "type": "path", "example": "/lychee", "default": "/lychee" }, { - "name": "is_public", - "type": "boolean", + "name": "is_public", + "type": "boolean", "help": { "en": "If enabled, Lychee will be accessible by people who do not have an account. This can be changed later via the webadmin.", "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." diff --git a/scripts/_common.sh b/scripts/_common.sh index 472f72e..1d22175 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,6 +9,7 @@ YNH_PHP_VERSION="8.0" # Composer version YNH_COMPOSER_VERSION="2.3.5" +# dependencies used by the app pkg_dependencies="ffmpeg php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysqli php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-intl" #================================================= diff --git a/scripts/backup b/scripts/backup index f57412d..f932df9 100755 --- a/scripts/backup +++ b/scripts/backup @@ -6,6 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= +# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -24,10 +25,10 @@ ynh_print_info --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME final_path=$(ynh_app_setting_get --app=$app --key=final_path) -public_path=$(ynh_app_setting_get --app=$app --key=public_path) domain=$(ynh_app_setting_get --app=$app --key=domain) db_name=$(ynh_app_setting_get --app=$app --key=db_name) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= # DECLARE DATA AND CONF FILES TO BACKUP @@ -41,10 +42,10 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$final_path" #================================================= -# BACKUP MEDIA FOLDER +# BACKUP THE DATA DIR #================================================= -ynh_backup --src_path="$public_path" --is_big +ynh_backup --src_path="$datadir" --is_big #================================================= # BACKUP THE NGINX CONFIGURATION diff --git a/scripts/change_url b/scripts/change_url index f76a1eb..8b24f20 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -9,9 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -# Stop script if errors -ynh_abort_if_errors - #================================================= # RETRIEVE ARGUMENTS #================================================= @@ -31,12 +28,14 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) -public_path=$(ynh_app_setting_get --app=$app --key=public_path) + +# Add settings here as needed by your application +datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up Lychee before changing its URL..." --weight=2 +ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=2 # Backup the current version of the app ynh_backup_before_upgrade @@ -44,7 +43,7 @@ ynh_clean_setup () { # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" - # restore it if the upgrade fails + # Restore it if the upgrade fails ynh_restore_upgradebackup } # Exit if an error occurs during the execution of the script diff --git a/scripts/install b/scripts/install index b19f4ff..d4943ac 100755 --- a/scripts/install +++ b/scripts/install @@ -22,7 +22,6 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC -phpversion=$YNH_PHP_VERSION app=$YNH_APP_INSTANCE_NAME @@ -31,6 +30,7 @@ app=$YNH_APP_INSTANCE_NAME #================================================= ynh_script_progression --message="Validating installation parameters..." --weight=1 +datadir=/home/yunohost.app/$app final_path=/var/www/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" @@ -85,19 +85,13 @@ chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" #================================================= -# CREATE DATA DIRECTORY +# PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Creating a data directory..." --weight=1 +ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 -public_path=/home/yunohost.app/$app -ynh_app_setting_set --app=$app --key=public_path --value=$public_path - -mkdir -p $public_path/uploads -mkdir -p $public_path/uploads/{big,import,medium,raw,small,thumb} - -chmod 750 "$public_path" -chmod -R o-rwx "$public_path" -chown -R $app:www-data "$public_path" +# Create a dedicated PHP-FPM config +ynh_add_fpm_config +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # NGINX CONFIGURATION @@ -108,17 +102,35 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=1 ynh_add_nginx_config #================================================= -# PHP-FPM CONFIGURATION +# SPECIFIC SETUP #================================================= -ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 +# CREATE DATA DIRECTORY +#================================================= +ynh_script_progression --message="Creating a data directory..." --weight=1 -# Create a dedicated PHP-FPM config -ynh_add_fpm_config +ynh_app_setting_set --app=$app --key=datadir --value=$datadir + +mkdir -p $datadir/uploads +mkdir -p $datadir/uploads/{big,import,medium,raw,small,thumb} + +chmod 750 "$datadir" +chmod -R o-rwx "$datadir" +chown -R $app:www-data "$datadir" #================================================= -# INSTALL LYCHEE WITH COMPOSER +# ADD A CONFIGURATION #================================================= -ynh_script_progression --message="Installing $app with Composer..." --weight=15 +ynh_script_progression --message="Adding a configuration file..." + +ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env" + +chmod 400 "$final_path/.env" +chown $app:$app "$final_path/.env" + +#================================================= +# INSTALL APP WITH COMPOSER +#================================================= +ynh_script_progression --message="Installing app with Composer..." --weight=15 ynh_install_composer --install_args="--ignore-platform-reqs" @@ -127,10 +139,6 @@ ynh_install_composer --install_args="--ignore-platform-reqs" #================================================= ynh_script_progression --message="Building..." --weight=10 -# Setup application config -ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env" - -# Setup application config pushd $final_path php$phpversion artisan key:generate -n --force --env php$phpversion artisan migrate -n --force @@ -142,19 +150,23 @@ popd # Setup custom user.css file ynh_add_config --template="../conf/user.css.example" --destination="$final_path/public/dist/user.css" -ynh_replace_string --match_string="\$ffmpeg = FFMpeg::create();" --replace_string="\$ffmpeg = FFMpeg::create(array(\ - 'ffmpeg.binaries' => '/usr/bin/ffmpeg',\ - 'ffprobe.binaries' => '/usr/bin/ffprobe',\ -));" --target_file="$final_path/app/Actions/Photo/Extensions/VideoEditing.php" +ynh_replace_string \ +--match_string="\$ffmpeg = FFMpeg::create();" \ +--replace_string="\$ffmpeg = FFMpeg::create(array('ffmpeg.binaries' => '/usr/bin/ffmpeg','ffprobe.binaries' => '/usr/bin/ffprobe',));" \ +--target_file="$final_path/app/Actions/Photo/Extensions/VideoEditing.php" +#================================================= +# GENERIC FINALIZATION #================================================= # SETUP SSOWAT #================================================= ynh_script_progression --message="Configuring permissions..." --weight=1 -# Make app public if necessary or protect it +# Make app public if necessary if [ $is_public -eq 1 ] then + # Everyone can access the app. + # The "main" permission is automatically created before the install script. ynh_permission_update --permission="main" --add="visitors" fi diff --git a/scripts/remove b/scripts/remove index 0c9bc89..285ab44 100755 --- a/scripts/remove +++ b/scripts/remove @@ -17,13 +17,21 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -public_path=$(ynh_app_setting_get --app=$app --key=public_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name +final_path=$(ynh_app_setting_get --app=$app --key=final_path) +datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= # STANDARD REMOVE +#================================================= +# REMOVE THE MYSQL DATABASE +#================================================= +ynh_script_progression --message="Removing the MySQL database..." --weight=2 + +# Remove a database if it exists, along with the associated user +ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name + #================================================= # REMOVE APP MAIN DIR #================================================= @@ -36,21 +44,13 @@ ynh_secure_remove --file="$final_path" # REMOVE DATA DIR #================================================= -# Remove the app data directory with the command `yunohost app remove lychee --purge` -if [ "$YNH_APP_PURGE" == true ] +# Remove the data directory if --purge option is used +if [ "${YNH_APP_PURGE:-0}" -eq 1 ] then - ynh_script_progression --message="Removing $app data directory..." --weight=2 - ynh_secure_remove --file="$public_path" + ynh_script_progression --message="Removing app data directory..." + ynh_secure_remove --file="$datadir" fi -#================================================= -# REMOVE THE MYSQL DATABASE -#================================================= -ynh_script_progression --message="Removing the MySQL database..." --weight=2 - -# Remove a database if it exists, along with the associated user -ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name - #================================================= # REMOVE NGINX CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index 8d87b27..49100e7 100755 --- a/scripts/restore +++ b/scripts/restore @@ -6,6 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= +# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -13,6 +14,7 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= +# Exit if an error occurs during the execution of the script ynh_abort_if_errors #================================================= @@ -25,26 +27,21 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -public_path=$(ynh_app_setting_get --app=$app --key=public_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= # CHECK IF THE APP CAN BE RESTORED #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path \ + || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -66,18 +63,17 @@ chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" #================================================= -# RESTORE DATA +# RESTORE THE DATA DIRECTORY #================================================= ynh_script_progression --message="Restoring the data directory..." -# Use --not_mandatory for the data directory, because if the backup has been made with BACKUP_CORE_ONLY, there's no data into the backup. -ynh_restore_file --origin_path="$public_path" --not_mandatory +ynh_restore_file --origin_path="$datadir" --not_mandatory -mkdir -p $public_path +mkdir -p $datadir -chmod 755 "$public_path" -chmod -R o-rwx "$public_path" -chown -R $app:www-data "$public_path" +chmod 750 "$datadir" +chmod -R o-rwx "$datadir" +chown -R $app:www-data "$datadir" #================================================= # REINSTALL DEPENDENCIES @@ -90,13 +86,16 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Restoring PHP-FPM configuration..." +ynh_script_progression --message="Restoring the PHP-FPM configuration..." -# Restore the file first, so it can have a backup if different ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -# Recreate a dedicated PHP-FPM config -ynh_add_fpm_config +#================================================= +# RESTORE THE NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring the NGINX web server configuration..." + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # RESTORE THE MYSQL DATABASE diff --git a/scripts/upgrade b/scripts/upgrade index 3a02d1b..a57f0dc 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -19,31 +19,35 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -public_path=$(ynh_app_setting_get --app=$app --key=public_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) +datadir=$(ynh_app_setting_get --app=$app --key=datadir) phpversion=$YNH_PHP_VERSION #================================================= # CHECK VERSION #================================================= +ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up Lychee before upgrading..." --weight=3 +ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=3 # Backup the current version of the app ynh_backup_before_upgrade ynh_clean_setup () { - # restore it if the upgrade fails + # Restore it if the upgrade fails ynh_restore_upgradebackup } # Exit if an error occurs during the execution of the script ynh_abort_if_errors +#================================================= +# STANDARD UPGRADE STEPS #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= @@ -61,23 +65,23 @@ if [ -z "$final_path" ]; then ynh_app_setting_set --app=$app --key=final_path --value=$final_path fi -# If public_path doesn't exist, create it -if [ -z "$public_path" ]; then - public_path=/home/yunohost.app/$app - mkdir -p $public_path - chmod 755 $public_path - chown -R $app:www-data $public_path - ynh_app_setting_set --app=$app --key=public_path --value=$public_path +# If datadir doesn't exist, create it +if [ -z "$datadir" ]; then + datadir=/home/yunohost.app/$app + mkdir -p $datadir + chmod 755 $datadir + chown -R $app:www-data $datadir + ynh_app_setting_set --app=$app --key=datadir --value=$datadir fi # If new "/home/yunohost.app/$app" doesn't exist, create it if [ -z "/home/yunohost.app/$app" ]; then - public_path=/home/yunohost.app/$app - mkdir -p $public_path - chmod 755 $public_path - chown -R $app:www-data $public_path - ynh_app_setting_set --app=$app --key=public_path --value=$public_path - cp -a "$final_path/public/uploads" "$public_path/uploads" + datadir=/home/yunohost.app/$app + mkdir -p $datadir + chmod 755 $datadir + chown -R $app:www-data $datadir + ynh_app_setting_set --app=$app --key=datadir --value=$datadir + cp -a "$final_path/public/uploads" "$datadir/uploads" fi # Cleaning legacy permissions @@ -104,7 +108,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=4 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep="$final_path/.env $final_path/public/dist/user.css" + ynh_setup_source --dest_dir="$final_path" --keep=".env public/dist/user.css" fi chmod 750 "$final_path" @@ -126,6 +130,7 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config ynh_add_fpm_config +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # NGINX CONFIGURATION @@ -136,40 +141,43 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - ynh_add_nginx_config #================================================= -# PHP-FPM CONFIGURATION +# SPECIFIC UPGRADE #================================================= -ynh_script_progression --message="Installing Composer..." --weight=1 +# UPDATE A CONFIG FILE +#================================================= +ynh_script_progression --message="Updating a configuration file..." + +ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env" + +chmod 400 "$final_path/.env" +chown $app:$app "$final_path/.env" + +#================================================= +# INSTALL APP WITH COMPOSER +#================================================= +ynh_script_progression --message="Installing app with Composer..." --weight=1 ynh_install_composer --install_args="--ignore-platform-reqs" #================================================= -# SETUP APPLICATION CONFIG +# BUILDING #================================================= -ynh_script_progression --message="Setting $app config..." - -# Setup application config -#ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env" - -ynh_replace_string --match_string="\$ffmpeg = FFMpeg::create();" --replace_string="\$ffmpeg = FFMpeg::create(array(\ - 'ffmpeg.binaries' => '/usr/bin/ffmpeg',\ - 'ffprobe.binaries' => '/usr/bin/ffprobe',\ -));" --target_file="$final_path/app/Actions/Photo/Extensions/VideoEditing.php" - -#================================================= -# INSTALL AND INITIALIZE COMPOSER -#================================================= -ynh_script_progression --message="Upgrading $app source files..." --weight=4 +ynh_script_progression --message="Building..." --weight=4 ynh_exec_warn_less ynh_composer_exec --commands="dump-autoload" pushd $final_path - #php$phpversion artisan key:generate php$phpversion artisan migrate -n --force php$phpversion artisan config:clear -n php$phpversion artisan config:cache -n php$phpversion artisan view:clear popd +ynh_replace_string \ +--match_string="\$ffmpeg = FFMpeg::create();" \ +--replace_string="\$ffmpeg = FFMpeg::create(array('ffmpeg.binaries' => '/usr/bin/ffmpeg','ffprobe.binaries' => '/usr/bin/ffprobe',));" \ +--target_file="$final_path/app/Actions/Photo/Extensions/VideoEditing.php" + chmod 750 "$final_path" chmod 750 "$final_path/bootstrap/cache" chmod -R o-rwx "$final_path" From 9decd274f6f648920873153c84b1a290a851472b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 8 Aug 2022 14:46:14 +0000 Subject: [PATCH 020/112] Auto-update README --- README.md | 1 + README_fr.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d6e84d0..f633584 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ Lychee is a free photo-management tool, which runs on your server or web-space. **Shipped version:** 4.4.0~ynh4 + **Demo:** https://lycheeorg.github.io/demo/ ## Screenshots diff --git a/README_fr.md b/README_fr.md index ab477e6..170dd5e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour 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. -**Version incluse :** 4.4.0~ynh4 +**Version incluse :** 4.4.0~ynh4 + **Démo :** https://lycheeorg.github.io/demo/ From 930ada66ff6c41c5c826249aedb29c560e0fc3b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 5 Jan 2023 23:47:51 +0100 Subject: [PATCH 021/112] 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 --- README.md | 3 +- README_fr.md | 3 +- conf/app.src | 4 +- conf/extra_php-fpm.conf | 4 + conf/ffprobe.patch | 6 +- conf/php-fpm.conf | 430 ---------------------------------------- config_panel.toml | 30 +++ manifest.json | 6 +- scripts/_common.sh | 6 +- scripts/config | 95 +++++++++ scripts/install | 33 +-- scripts/restore | 6 + scripts/upgrade | 42 +++- 13 files changed, 201 insertions(+), 467 deletions(-) create mode 100644 conf/extra_php-fpm.conf delete mode 100644 conf/php-fpm.conf create mode 100644 config_panel.toml create mode 100644 scripts/config diff --git a/README.md b/README.md index f633584..3e7442f 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in 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. -**Shipped version:** 4.4.0~ynh4 - +**Shipped version:** 4.7.0~ynh1 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index 170dd5e..e78e840 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,8 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour 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. -**Version incluse :** 4.4.0~ynh4 - +**Version incluse :** 4.7.0~ynh1 **Démo :** https://lycheeorg.github.io/demo/ diff --git a/conf/app.src b/conf/app.src index 1d9e55d..8b3c2ae 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/LycheeOrg/Lychee/releases/download/v4.4.0/Lychee.zip -SOURCE_SUM=2d451033e392e6c3287f8962524e9b4f5581d8e3dfcc9040690d2dc190274c26 +SOURCE_URL=https://github.com/LycheeOrg/Lychee/releases/download/v4.7.0/Lychee.zip +SOURCE_SUM=5b2135a53ee938506e7375f9a63636071d31eebbc143ae9d3c29fb3fb98058fb SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf new file mode 100644 index 0000000..9dacb8a --- /dev/null +++ b/conf/extra_php-fpm.conf @@ -0,0 +1,4 @@ +; Additional php.ini defines, specific to this pool of workers. + +php_admin_value[upload_max_filesize] = 512M +php_admin_value[post_max_size] = 512M diff --git a/conf/ffprobe.patch b/conf/ffprobe.patch index c5d298e..37cd969 100644 --- a/conf/ffprobe.patch +++ b/conf/ffprobe.patch @@ -2,12 +2,12 @@ diff --git a/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php b/vendor index 9ececfe..106eadd 100644 --- a/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php +++ b/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php -@@ -33,7 +33,7 @@ class FFprobe extends AdapterAbstract +@@ -40,7 +40,7 @@ class FFprobe extends AdapterAbstract * * @var string */ -- protected $toolPath; -+ protected $toolPath = '/usr/bin/ffprobe'; +- protected string $toolPath = ''; ++ protected string $toolPath = '/usr/bin/ffprobe'; /** * @var string-e diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf deleted file mode 100644 index a4d5b1e..0000000 --- a/conf/php-fpm.conf +++ /dev/null @@ -1,430 +0,0 @@ -; Start a new pool named 'www'. -; the variable $pool can be used in any directive and will be replaced by the -; pool name ('www' here) -[__NAMETOCHANGE__] - -; Per pool prefix -; It only applies on the following directives: -; - 'access.log' -; - 'slowlog' -; - 'listen' (unixsocket) -; - 'chroot' -; - 'chdir' -; - 'php_values' -; - 'php_admin_values' -; When not set, the global prefix (or /usr) applies instead. -; Note: This directive can also be relative to the global prefix. -; Default Value: none -;prefix = /path/to/pools/$pool - -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. -user = __USER__ -group = __USER__ - -; The address on which to accept FastCGI requests. -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on -; a specific port; -; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses -; (IPv6 and IPv4-mapped) on a specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Note: This value is mandatory. -listen = /var/run/php/php__PHPVERSION__-fpm-__NAMETOCHANGE__.sock - -; Set listen(2) backlog. -; Default Value: 511 (-1 on FreeBSD and OpenBSD) -;listen.backlog = 511 - -; Set permissions for unix socket, if one is used. In Linux, read/write -; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. -; Default Values: user and group are set as the running user -; mode is set to 0660 -listen.owner = www-data -listen.group = www-data -;listen.mode = 0660 -; When POSIX Access Control Lists are supported you can set them using -; these options, value is a comma separated list of user/group names. -; When set, listen.owner and listen.group are ignored -;listen.acl_users = -;listen.acl_groups = - -; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. -; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address -; must be separated by a comma. If this value is left blank, connections will be -; accepted from any ip address. -; Default Value: any -;listen.allowed_clients = 127.0.0.1 - -; Specify the nice(2) priority to apply to the pool processes (only if set) -; The value can vary from -19 (highest priority) to 20 (lower priority) -; Note: - It will only work if the FPM master process is launched as root -; - The pool processes will inherit the master process priority -; unless it specified otherwise -; Default Value: no set -; process.priority = -19 - -; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user -; or group is differrent than the master process user. It allows to create process -; core dump and ptrace the process for the pool user. -; Default Value: no -; process.dumpable = yes - -; Choose how the process manager will control the number of child processes. -; Possible Values: -; static - a fixed number (pm.max_children) of child processes; -; dynamic - the number of child processes are set dynamically based on the -; following directives. With this process management, there will be -; always at least 1 children. -; pm.max_children - the maximum number of children that can -; be alive at the same time. -; pm.start_servers - the number of children created on startup. -; pm.min_spare_servers - the minimum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is less than this -; number then some children will be created. -; pm.max_spare_servers - the maximum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is greater than this -; number then some children will be killed. -; ondemand - no children are created at startup. Children will be forked when -; new requests will connect. The following parameter are used: -; pm.max_children - the maximum number of children that -; can be alive at the same time. -; pm.process_idle_timeout - The number of seconds after which -; an idle process will be killed. -; Note: This value is mandatory. -pm = dynamic - -; The number of child processes to be created when pm is set to 'static' and the -; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. -; This value sets the limit on the number of simultaneous requests that will be -; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. -; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. The below defaults are based on a server without much resources. Don't -; forget to tweak pm.* to fit your needs. -; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' -; Note: This value is mandatory. -pm.max_children = 5 - -; The number of child processes created on startup. -; Note: Used only when pm is set to 'dynamic' -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 -pm.start_servers = 2 - -; The desired minimum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = 1 - -; The desired maximum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = 3 - -; The number of seconds after which an idle process will be killed. -; Note: Used only when pm is set to 'ondemand' -; Default Value: 10s -;pm.process_idle_timeout = 10s; - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. For -; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default Value: 0 -;pm.max_requests = 500 - -; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. It shows the following informations: -; pool - the name of the pool; -; process manager - static, dynamic or ondemand; -; start time - the date and time FPM has started; -; start since - number of seconds since FPM has started; -; accepted conn - the number of request accepted by the pool; -; listen queue - the number of request in the queue of pending -; connections (see backlog in listen(2)); -; max listen queue - the maximum number of requests in the queue -; of pending connections since FPM has started; -; listen queue len - the size of the socket queue of pending connections; -; idle processes - the number of idle processes; -; active processes - the number of active processes; -; total processes - the number of idle + active processes; -; max active processes - the maximum number of active processes since FPM -; has started; -; max children reached - number of times, the process limit has been reached, -; when pm tries to start more children (works only for -; pm 'dynamic' and 'ondemand'); -; Value are updated in real time. -; Example output: -; pool: www -; process manager: static -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 62636 -; accepted conn: 190460 -; listen queue: 0 -; max listen queue: 1 -; listen queue len: 42 -; idle processes: 4 -; active processes: 11 -; total processes: 15 -; max active processes: 12 -; max children reached: 0 -; -; By default the status page output is formatted as text/plain. Passing either -; 'html', 'xml' or 'json' in the query string will return the corresponding -; output syntax. Example: -; http://www.foo.bar/status -; http://www.foo.bar/status?json -; http://www.foo.bar/status?html -; http://www.foo.bar/status?xml -; -; By default the status page only outputs short status. Passing 'full' in the -; query string will also return status for each pool process. -; Example: -; http://www.foo.bar/status?full -; http://www.foo.bar/status?json&full -; http://www.foo.bar/status?html&full -; http://www.foo.bar/status?xml&full -; The Full status returns for each process: -; pid - the PID of the process; -; state - the state of the process (Idle, Running, ...); -; start time - the date and time the process has started; -; start since - the number of seconds since the process has started; -; requests - the number of requests the process has served; -; request duration - the duration in µs of the requests; -; request method - the request method (GET, POST, ...); -; request URI - the request URI with the query string; -; content length - the content length of the request (only with POST); -; user - the user (PHP_AUTH_USER) (or '-' if not set); -; script - the main script called (or '-' if not set); -; last request cpu - the %cpu the last request consumed -; it's always 0 if the process is not in Idle state -; because CPU calculation is done when the request -; processing has terminated; -; last request memory - the max amount of memory the last request consumed -; it's always 0 if the process is not in Idle state -; because memory calculation is done when the request -; processing has terminated; -; If the process is in Idle state, then informations are related to the -; last request the process has served. Otherwise informations are related to -; the current request being served. -; Example output: -; ************************ -; pid: 31330 -; state: Running -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 63087 -; requests: 12808 -; request duration: 1250261 -; request method: GET -; request URI: /test_mem.php?N=10000 -; content length: 0 -; user: - -; script: /home/fat/web/docs/php/test_mem.php -; last request cpu: 0.00 -; last request memory: 0 -; -; Note: There is a real-time FPM status monitoring sample web page available -; It's available in: /usr/share/php/7.0/fpm/status.html -; -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;pm.status_path = /status - -; The ping URI to call the monitoring page of FPM. If this value is not set, no -; URI will be recognized as a ping page. This could be used to test from outside -; that FPM is alive and responding, or to -; - create a graph of FPM availability (rrd or such); -; - remove a server from a group if it is not responding (load balancing); -; - trigger alerts for the operating team (24/7). -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;ping.path = /ping - -; This directive may be used to customize the response of a ping request. The -; response is formatted as text/plain with a 200 response code. -; Default Value: pong -;ping.response = pong - -; The access log file -; Default: not set -;access.log = log/$pool.access.log - -; The access log format. -; The following syntax is allowed -; %%: the '%' character -; %C: %CPU used by the request -; it can accept the following format: -; - %{user}C for user CPU only -; - %{system}C for system CPU only -; - %{total}C for user + system CPU (default) -; %d: time taken to serve the request -; it can accept the following format: -; - %{seconds}d (default) -; - %{miliseconds}d -; - %{mili}d -; - %{microseconds}d -; - %{micro}d -; %e: an environment variable (same as $_ENV or $_SERVER) -; it must be associated with embraces to specify the name of the env -; variable. Some exemples: -; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e -; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e -; %f: script filename -; %l: content-length of the request (for POST request only) -; %m: request method -; %M: peak of memory allocated by PHP -; it can accept the following format: -; - %{bytes}M (default) -; - %{kilobytes}M -; - %{kilo}M -; - %{megabytes}M -; - %{mega}M -; %n: pool name -; %o: output header -; it must be associated with embraces to specify the name of the header: -; - %{Content-Type}o -; - %{X-Powered-By}o -; - %{Transfert-Encoding}o -; - .... -; %p: PID of the child that serviced the request -; %P: PID of the parent of the child that serviced the request -; %q: the query string -; %Q: the '?' character if query string exists -; %r: the request URI (without the query string, see %q and %Q) -; %R: remote IP address -; %s: status (response code) -; %t: server time the request was received -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %T: time the log has been written (the request has finished) -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %u: remote user -; -; Default: "%R - %u %t \"%m %r\" %s" -;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" - -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -;slowlog = log/$pool.log.slow - -; The timeout for serving a single request after which a PHP backtrace will be -; dumped to the 'slowlog' file. A value of '0s' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_slowlog_timeout = 0 - -; The timeout for serving a single request after which the worker process will -; be killed. This option should be used when the 'max_execution_time' ini option -; does not stop script execution for some reason. A value of '0' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -request_terminate_timeout = 1d - -; Set open file descriptor rlimit. -; Default Value: system defined value -;rlimit_files = 1024 - -; Set max core size rlimit. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -;rlimit_core = 0 - -; Chroot to this directory at the start. This value must be defined as an -; absolute path. When this value is not set, chroot is not used. -; Note: you can prefix with '$prefix' to chroot to the pool prefix or one -; of its subdirectories. If the pool prefix is not set, the global prefix -; will be used instead. -; Note: chrooting is a great security feature and should be used whenever -; possible. However, all PHP paths will be relative to the chroot -; (error_log, sessions.save_path, ...). -; Default Value: not set -;chroot = - -; Chdir to this directory at the start. -; Note: relative path can be used. -; Default Value: current directory or / when chroot -chdir = __FINALPATH__ - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -;catch_workers_output = yes - -; Clear environment in FPM workers -; Prevents arbitrary environment variables from reaching FPM worker processes -; by clearing the environment in workers before env vars specified in this -; pool configuration are added. -; Setting to "no" will make all environment variables available to PHP code -; via getenv(), $_ENV and $_SERVER. -; Default Value: yes -;clear_env = no - -; Limits the extensions of the main script FPM will allow to parse. This can -; prevent configuration mistakes on the web server side. You should only limit -; FPM to .php extensions to prevent malicious users to use other extensions to -; execute php code. -; Note: set an empty value to allow all extensions. -; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 .php7 - -; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from -; the current environment. -; Default Value: clean env -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -; Additional php.ini defines, specific to this pool of workers. These settings -; overwrite the values previously defined in the php.ini. The directives are the -; same as the PHP SAPI: -; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. -; php_admin_value/php_admin_flag - these directives won't be overwritten by -; PHP call 'ini_set' -; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. - -; Defining 'extension' will load the corresponding shared extension from -; extension_dir. Defining 'disable_functions' or 'disable_classes' will not -; overwrite previously defined php.ini values, but will append the new value -; instead. - -; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /usr) - -; Default Value: nothing is defined by default except the values in php.ini and -; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M - -; Common values to change to increase file upload limit -php_admin_value[upload_max_filesize] = 512M -php_admin_value[post_max_size] = 512M -; php_admin_flag[mail.add_x_header] = Off - -; Other common parameters -php_admin_value[max_execution_time] = 200 -; php_admin_value[max_input_time] = 300 -php_admin_value[memory_limit] = 256M -; php_admin_flag[short_open_tag] = On diff --git a/config_panel.toml b/config_panel.toml new file mode 100644 index 0000000..2345ba3 --- /dev/null +++ b/config_panel.toml @@ -0,0 +1,30 @@ +version = "1.0" + +[main] +name = "Lychee configuration" + + [main.php_fpm_config] + name = "PHP-FPM configuration" + + [main.php_fpm_config.fpm_footprint] + ask = "Memory footprint" + type = "select" + choices.low = "Low, <= 20Mb per pool" + choices.medium = "Medium, between 20Mb and 40Mb per pool" + choices.high = "High, > 40Mb per pool" + choices.specific = "Use specific value" + default = "low" + + [main.php_fpm_config.fpm_free_footprint] + visible = "fpm_footprint == 'specific'" + ask = "Memory footprint of the service?" + type = "number" + default = "0" + help = "Free field to specify exactly the footprint in Mb if you don't want to use one of the three previous values." + + [main.php_fpm_config.fpm_usage] + ask = "Expected usage" + type = "select" + choices = ["low", "medium", "high"] + default = "low" + help = "low: Personal usage, behind the SSO. No RAM footprint when not used, but the impact on the processor can be high if many users are using the service.
medium: Low usage, few people or/and publicly accessible. Low RAM footprint, medium processor footprint when used.
high: High usage, frequently visited website. High RAM footprint, but lower on processor usage and quickly responding." diff --git a/manifest.json b/manifest.json index 9a34178..461d41f 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Photo-management-system to manage and share photos", "fr": "Système de gestion de photos pour gérer et partager des photos" }, - "version": "4.4.0~ynh4", + "version": "4.7.0~ynh1", "url": "https://lycheeorg.github.io/", "upstream": { "license": "MIT", @@ -21,12 +21,12 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ "nginx", - "php8.0-fpm", + "php8.1-fpm", "mysql" ], "arguments": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 1d22175..420096a 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,13 +4,15 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="8.0" +YNH_PHP_VERSION="8.1" # Composer version YNH_COMPOSER_VERSION="2.3.5" # dependencies used by the app -pkg_dependencies="ffmpeg php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysqli php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-intl" +php_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysqli php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-intl" + +pkg_dependencies="ffmpeg $php_dependencies" #================================================= # PERSONAL HELPERS diff --git a/scripts/config b/scripts/config new file mode 100644 index 0000000..91c2de7 --- /dev/null +++ b/scripts/config @@ -0,0 +1,95 @@ +#!/bin/bash + +#================================================= +# GENERIC STARTING +#================================================= +# IMPORT GENERIC HELPERS +#================================================= + +source _common.sh +source /usr/share/yunohost/helpers + +ynh_abort_if_errors + +#================================================= +# RETRIEVE ARGUMENTS +#================================================= + +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +current_fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) + +#================================================= +# SPECIFIC GETTERS FOR TOML SHORT KEY +#================================================= + +get__fpm_footprint() { + # Free footprint value for php-fpm + # Check if current_fpm_footprint is an integer + if [ "$current_fpm_footprint" -eq "$current_fpm_footprint" ] 2> /dev/null + then + echo "specific" + else + echo "$current_fpm_footprint" + fi +} + +get__free_footprint() { + # Free footprint value for php-fpm + # Check if current_fpm_footprint is an integer + if [ "$current_fpm_footprint" -eq "$current_fpm_footprint" ] 2> /dev/null + then + # If current_fpm_footprint is an integer, that's a numeric value for the footprint + echo "$current_fpm_footprint" + else + echo "0" + fi +} + +#================================================= +# SPECIFIC SETTERS FOR TOML SHORT KEYS +#================================================= + +set__fpm_footprint() { + if [ "$fpm_footprint" != "specific" ] + then + ynh_app_setting_set --app=$app --key=fpm_footprint --value="$fpm_footprint" + fi +} + +set__fpm_free_footprint() { + if [ "$fpm_footprint" = "specific" ] + then + ynh_app_setting_set --app=$app --key=fpm_footprint --value="$fpm_free_footprint" + fi +} + +#================================================= +# GENERIC FINALIZATION +#================================================= + +ynh_app_config_validate() { + _ynh_app_config_validate + + if [ "${changed[fpm_usage]}" == "true" ] || [ "${changed[fpm_footprint]}" == "true" ] || [ "${changed[fpm_free_footprint]}" == "true" ]; then + # If fpm_footprint is set to 'specific', use $fpm_free_footprint value. + if [ "$fpm_footprint" = "specific" ] + then + fpm_footprint=$fpm_free_footprint + fi + + if [ "$fpm_footprint" == "0" ] + then + ynh_print_err --message="When selecting 'specific', you have to set a footprint value into the field below." + + exit 0 + fi + fi +} + +ynh_app_config_apply() { + _ynh_app_config_apply + + ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint +} + +ynh_app_config_run $1 diff --git a/scripts/install b/scripts/install index d4943ac..e62858c 100755 --- a/scripts/install +++ b/scripts/install @@ -25,6 +25,10 @@ is_public=$YNH_APP_ARG_IS_PUBLIC app=$YNH_APP_INSTANCE_NAME +fpm_footprint="low" +fpm_free_footprint=0 +fpm_usage="low" + #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= @@ -44,6 +48,9 @@ ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url +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 #================================================= # INSTALL DEPENDENCIES @@ -90,7 +97,7 @@ chown -R $app:www-data "$final_path" ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= @@ -117,6 +124,13 @@ chmod 750 "$datadir" chmod -R o-rwx "$datadir" chown -R $app:www-data "$datadir" +#================================================= +# INSTALL APP WITH COMPOSER +#================================================= +ynh_script_progression --message="Installing app with Composer..." --weight=15 + +ynh_install_composer + #================================================= # ADD A CONFIGURATION #================================================= @@ -127,13 +141,6 @@ ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env chmod 400 "$final_path/.env" chown $app:$app "$final_path/.env" -#================================================= -# INSTALL APP WITH COMPOSER -#================================================= -ynh_script_progression --message="Installing app with Composer..." --weight=15 - -ynh_install_composer --install_args="--ignore-platform-reqs" - #================================================= # BUILDING #================================================= @@ -144,16 +151,16 @@ pushd $final_path php$phpversion artisan migrate -n --force php$phpversion artisan config:clear -n php$phpversion artisan config:cache -n - patch -p1 < "$YNH_CWD/../conf/ffprobe.patch" + #patch -p1 < "$YNH_CWD/../conf/ffprobe.patch" popd # Setup custom user.css file ynh_add_config --template="../conf/user.css.example" --destination="$final_path/public/dist/user.css" -ynh_replace_string \ ---match_string="\$ffmpeg = FFMpeg::create();" \ ---replace_string="\$ffmpeg = FFMpeg::create(array('ffmpeg.binaries' => '/usr/bin/ffmpeg','ffprobe.binaries' => '/usr/bin/ffprobe',));" \ ---target_file="$final_path/app/Actions/Photo/Extensions/VideoEditing.php" +#ynh_replace_string \ +#--match_string="\$ffmpeg = FFMpeg::create();" \ +#--replace_string="\$ffmpeg = FFMpeg::create(array('ffmpeg.binaries' => '/usr/bin/ffmpeg','ffprobe.binaries' => '/usr/bin/ffprobe',));" \ +#--target_file="$final_path/app/Actions/Photo/Extensions/VideoEditing.php" #================================================= # GENERIC FINALIZATION diff --git a/scripts/restore b/scripts/restore index 49100e7..e96de69 100755 --- a/scripts/restore +++ b/scripts/restore @@ -32,6 +32,9 @@ db_user=$db_name phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) datadir=$(ynh_app_setting_get --app=$app --key=datadir) +fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) +fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) + #================================================= # CHECK IF THE APP CAN BE RESTORED #================================================= @@ -90,6 +93,9 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." 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 #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index a57f0dc..12b781f 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -25,6 +25,10 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) datadir=$(ynh_app_setting_get --app=$app --key=datadir) phpversion=$YNH_PHP_VERSION +fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) +fpm_free_footprint=$(ynh_app_setting_get --app=$app --key=fpm_free_footprint) +fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) + #================================================= # CHECK VERSION #================================================= @@ -84,6 +88,24 @@ if [ -z "/home/yunohost.app/$app" ]; then cp -a "$final_path/public/uploads" "$datadir/uploads" fi +# 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 + # Cleaning legacy permissions if ynh_legacy_permissions_exists; then ynh_legacy_permissions_delete_all @@ -129,7 +151,7 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config +ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= @@ -145,19 +167,19 @@ ynh_add_nginx_config #================================================= # UPDATE A CONFIG FILE #================================================= -ynh_script_progression --message="Updating a configuration file..." +#ynh_script_progression --message="Updating a configuration file..." -ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env" +#ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env" -chmod 400 "$final_path/.env" -chown $app:$app "$final_path/.env" +#chmod 400 "$final_path/.env" +#chown $app:$app "$final_path/.env" #================================================= # INSTALL APP WITH COMPOSER #================================================= ynh_script_progression --message="Installing app with Composer..." --weight=1 -ynh_install_composer --install_args="--ignore-platform-reqs" +ynh_install_composer #================================================= # BUILDING @@ -173,10 +195,10 @@ pushd $final_path php$phpversion artisan view:clear popd -ynh_replace_string \ ---match_string="\$ffmpeg = FFMpeg::create();" \ ---replace_string="\$ffmpeg = FFMpeg::create(array('ffmpeg.binaries' => '/usr/bin/ffmpeg','ffprobe.binaries' => '/usr/bin/ffprobe',));" \ ---target_file="$final_path/app/Actions/Photo/Extensions/VideoEditing.php" +#ynh_replace_string \ +#--match_string="\$ffmpeg = FFMpeg::create();" \ +#--replace_string="\$ffmpeg = FFMpeg::create(array('ffmpeg.binaries' => '/usr/bin/ffmpeg','ffprobe.binaries' => '/usr/bin/ffprobe',));" \ +#--target_file="$final_path/app/Actions/Photo/Extensions/VideoEditing.php" chmod 750 "$final_path" chmod 750 "$final_path/bootstrap/cache" From 9bb4aac2bf5a9f62c7ec7302a4f18cb1177df116 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Fri, 24 Feb 2023 00:35:05 +0100 Subject: [PATCH 022/112] Upgrade auto-updater (#58) * [autopatch] Upgrade auto-updater * Auto-update README --------- Co-authored-by: tituspijean --- .github/workflows/updater.yml | 4 ++-- README.md | 3 ++- README_fr.md | 21 +++++++++++---------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index 4363d38..4a866ff 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Fetch the source code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: token: ${{ secrets.GITHUB_TOKEN }} - name: Run the updater script @@ -33,7 +33,7 @@ jobs: - name: Create Pull Request id: cpr if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: Update to version ${{ env.VERSION }} diff --git a/README.md b/README.md index 3e7442f..b2b1edc 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # Lychee for YunoHost -[![Integration level](https://dash.yunohost.org/integration/lychee.svg)](https://dash.yunohost.org/appci/app/lychee) ![Working status](https://ci-apps.yunohost.org/ci/badges/lychee.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/lychee.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/lychee.svg)](https://dash.yunohost.org/appci/app/lychee) ![Working status](https://ci-apps.yunohost.org/ci/badges/lychee.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/lychee.maintain.svg) + [![Install Lychee with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lychee) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index e78e840..7aae09d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,15 +5,16 @@ It shall NOT be edited by hand. # Lychee pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/lychee.svg)](https://dash.yunohost.org/appci/app/lychee) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/lychee.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/lychee.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/lychee.svg)](https://dash.yunohost.org/appci/app/lychee) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/lychee.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/lychee.maintain.svg) + [![Installer Lychee avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lychee) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Lychee 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 Lychee 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.* -## Vue d'ensemble +## 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. @@ -21,15 +22,15 @@ Lychee is a free photo-management tool, which runs on your server or web-space. **Démo :** https://lycheeorg.github.io/demo/ -## Captures d'écran +## Captures d’écran -![Capture d'écran de Lychee](./doc/screenshots/screenshot.jpg) +![Capture d’écran de Lychee](./doc/screenshots/screenshot.jpg) ## Documentations et ressources -* Site officiel de l'app : -* Documentation officielle de l'admin : -* Dépôt de code officiel de l'app : +* Site officiel de l’app : +* Documentation officielle de l’admin : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -45,4 +46,4 @@ ou sudo yunohost app upgrade lychee -u https://github.com/YunoHost-Apps/lychee_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From eb767f3f4ddbee7a49bb50e2e4d20527a4f2024b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 5 Mar 2023 19:35:43 +0100 Subject: [PATCH 023/112] Update .env.example --- conf/.env.example | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/.env.example b/conf/.env.example index 3be345a..1fe706f 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -65,3 +65,5 @@ PUSHER_APP_CLUSTER=mt1 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" + +ENABLE_TOKEN_AUTH=false From fa1a19999fbc36724ba973594db17f7a0f2c78ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Mar 2023 08:10:52 +0100 Subject: [PATCH 024/112] Version 2 (#61) * v2 * fix * v2 --- check_process | 22 -------- conf/.env.example | 4 +- conf/nginx.conf | 4 +- doc/DISCLAIMER.md | 0 manifest.json | 55 ------------------- manifest.toml | 57 ++++++++++++++++++++ scripts/_common.sh | 7 --- scripts/backup | 24 +-------- scripts/change_url | 87 +----------------------------- scripts/install | 113 +++++---------------------------------- scripts/remove | 65 ----------------------- scripts/restore | 80 +++------------------------- scripts/upgrade | 128 +++++++-------------------------------------- tests.toml | 7 +++ 14 files changed, 109 insertions(+), 544 deletions(-) delete mode 100644 check_process delete mode 100644 doc/DISCLAIMER.md delete mode 100644 manifest.json create mode 100644 manifest.toml create mode 100644 tests.toml diff --git a/check_process b/check_process deleted file mode 100644 index e0e99ad..0000000 --- a/check_process +++ /dev/null @@ -1,22 +0,0 @@ -;; Test complet - ; Manifest - domain="domain.tld" - path="/path" - is_public=1 - ; Checks - pkg_linter=1 - setup_sub_dir=1 - setup_root=1 - setup_nourl=0 - setup_private=1 - setup_public=1 - upgrade=1 - # 4.4~ynh3 - upgrade=1 from_commit=a87e16f7ca7e6645610745970bc7c3daa263b2b7 - backup_restore=1 - multi_instance=1 - port_already_use=0 - change_url=1 -;;; Options -Email= -Notification=none diff --git a/conf/.env.example b/conf/.env.example index 1fe706f..c4219da 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -32,8 +32,8 @@ DB_LOG_SQL=false TIMEZONE=UTC # folders in which the files will be stored -LYCHEE_DIST="__FINALPATH__/public/dist/" -LYCHEE_UPLOADS="__DATADIR__/uploads/" +LYCHEE_DIST="__INSTALL_DIR__/public/dist/" +LYCHEE_UPLOADS="__DATA_DIR__/uploads/" # url to access those files # LYCHEE_DIST_URL="dist/" diff --git a/conf/nginx.conf b/conf/nginx.conf index 5527081..ece5e5f 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,7 +2,7 @@ location ^~ __PATH__/ { # Path to source - alias __FINALPATH__/public/; + alias __INSTALL_DIR__/public/; index index.php; @@ -26,7 +26,7 @@ location ^~ __PATH__/ { } location __PATH__/uploads/ { - alias __DATADIR__/uploads/ ; + alias __DATA_DIR__/uploads/ ; } # Include SSOWAT user panel. diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md deleted file mode 100644 index e69de29..0000000 diff --git a/manifest.json b/manifest.json deleted file mode 100644 index 461d41f..0000000 --- a/manifest.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "name": "Lychee", - "id": "lychee", - "packaging_format": 1, - "description": { - "en": "Photo-management-system to manage and share photos", - "fr": "Système de gestion de photos pour gérer et partager des photos" - }, - "version": "4.7.0~ynh1", - "url": "https://lycheeorg.github.io/", - "upstream": { - "license": "MIT", - "website": "https://lycheeorg.github.io/", - "demo": "https://lycheeorg.github.io/demo/", - "admindoc": "https://lycheeorg.github.io/docs/", - "code": "https://github.com/LycheeOrg/Lychee" - }, - "license": "MIT", - "maintainer": { - "name": "eric_G", - "email": "" - }, - "requirements": { - "yunohost": ">= 11.0.9" - }, - "multi_instance": true, - "services": [ - "nginx", - "php8.1-fpm", - "mysql" - ], - "arguments": { - "install": [ - { - "name": "domain", - "type": "domain" - }, - { - "name": "path", - "type": "path", - "example": "/lychee", - "default": "/lychee" - }, - { - "name": "is_public", - "type": "boolean", - "help": { - "en": "If enabled, Lychee will be accessible by people who do not have an account. This can be changed later via the webadmin.", - "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." - }, - "default": true - } - ] - } -} diff --git a/manifest.toml b/manifest.toml new file mode 100644 index 0000000..bc0b8ed --- /dev/null +++ b/manifest.toml @@ -0,0 +1,57 @@ +packaging_format = 2 + +id = "lychee" +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.7.0~ynh1" + +maintainers = ["eric_G"] + +[upstream] +license = "MIT" +website = "https://lycheeorg.github.io/" +demo = "https://lycheeorg.github.io/demo/" +admindoc = "https://lycheeorg.github.io/docs/" +code = "https://github.com/LycheeOrg/Lychee" + +[integration] +yunohost = ">= 11.1.13" +architectures = "all" +multi_instance = true +ldap = false +sso = false +disk = "50M" +ram.build = "50M" +ram.runtime = "50M" + +[install] + [install.domain] + type = "domain" + + [install.path] + type = "path" + 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" + +[resources] + [resources.system_user] + + [resources.install_dir] + + [resources.data_dir] + + [resources.permissions] + main.url = "/" + + [resources.apt] + packages = "mariadb-server ffmpeg php8.1-xml php8.1-imagick php8.1-bcmath php8.1-exif php8.1-mbstring php8.1-gd php8.1-mysqli php8.1-zip php8.1-intl" + + [resources.database] + type = "mysql" diff --git a/scripts/_common.sh b/scripts/_common.sh index 420096a..13781df 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,16 +4,9 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="8.1" - # Composer version YNH_COMPOSER_VERSION="2.3.5" -# dependencies used by the app -php_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysqli php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-intl" - -pkg_dependencies="ffmpeg $php_dependencies" - #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/backup b/scripts/backup index f932df9..60cea71 100755 --- a/scripts/backup +++ b/scripts/backup @@ -10,26 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# LOAD SETTINGS -#================================================= -ynh_print_info --message="Loading installation settings..." - -app=$YNH_APP_INSTANCE_NAME - -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -domain=$(ynh_app_setting_get --app=$app --key=domain) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -datadir=$(ynh_app_setting_get --app=$app --key=datadir) - #================================================= # DECLARE DATA AND CONF FILES TO BACKUP #================================================= @@ -39,13 +19,13 @@ ynh_print_info --message="Declaring files to be backed up..." # BACKUP THE APP MAIN DIR #================================================= -ynh_backup --src_path="$final_path" +ynh_backup --src_path="$install_dir" #================================================= # BACKUP THE DATA DIR #================================================= -ynh_backup --src_path="$datadir" --is_big +ynh_backup --src_path="$data_dir" --is_big #================================================= # BACKUP THE NGINX CONFIGURATION diff --git a/scripts/change_url b/scripts/change_url index 8b24f20..df843ac 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -9,97 +9,12 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# RETRIEVE ARGUMENTS -#================================================= - -old_domain=$YNH_APP_OLD_DOMAIN -old_path=$YNH_APP_OLD_PATH - -new_domain=$YNH_APP_NEW_DOMAIN -new_path=$YNH_APP_NEW_PATH - -app=$YNH_APP_INSTANCE_NAME - -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 - -# Needed for helper "ynh_add_nginx_config" -final_path=$(ynh_app_setting_get --app=$app --key=final_path) - -# Add settings here as needed by your application -datadir=$(ynh_app_setting_get --app=$app --key=datadir) - -#================================================= -# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP -#================================================= -ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=2 - -# Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { - # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. - ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" - - # Restore it if the upgrade fails - ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# CHECK WHICH PARTS SHOULD BE CHANGED -#================================================= - -change_domain=0 -if [ "$old_domain" != "$new_domain" ] -then - change_domain=1 -fi - -change_path=0 -if [ "$old_path" != "$new_path" ] -then - change_path=1 -fi - #================================================= # MODIFY URL IN NGINX CONF #================================================= ynh_script_progression --message="Updating NGINX web server configuration..." --weight=3 -nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf - -# Change the path in the NGINX config file -if [ $change_path -eq 1 ] -then - # Make a backup of the original NGINX config file if modified - ynh_backup_if_checksum_is_different --file="$nginx_conf_path" - # Set global variables for NGINX helper - domain="$old_domain" - path_url="$new_path" - # Create a dedicated NGINX config - ynh_add_nginx_config -fi - -# Change the domain for NGINX -if [ $change_domain -eq 1 ] -then - # Delete file checksum for the old conf file location - ynh_delete_file_checksum --file="$nginx_conf_path" - mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf - # Store file checksum for the new config file location - ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" -fi - -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=2 - -ynh_systemd_action --service_name=nginx --action=reload +ynh_change_url_nginx_config #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index e62858c..9d15733 100755 --- a/scripts/install +++ b/scripts/install @@ -9,87 +9,33 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -ynh_abort_if_errors - #================================================= # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= -domain=$YNH_APP_ARG_DOMAIN -path_url=$YNH_APP_ARG_PATH -is_public=$YNH_APP_ARG_IS_PUBLIC - -app=$YNH_APP_INSTANCE_NAME - fpm_footprint="low" fpm_free_footprint=0 fpm_usage="low" -#================================================= -# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS -#================================================= -ynh_script_progression --message="Validating installation parameters..." --weight=1 - -datadir=/home/yunohost.app/$app -final_path=/var/www/$app -test ! -e "$final_path" || ynh_die --message="This path already contains a folder" - -# Register (book) web path -ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url - #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -ynh_script_progression --message="Storing installation settings..." --weight=1 -ynh_app_setting_set --app=$app --key=domain --value=$domain -ynh_app_setting_set --app=$app --key=path --value=$path_url 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 -#================================================= -# INSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Installing dependencies..." --weight=3 - -ynh_install_app_dependencies $pkg_dependencies - -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Configuring system user..." --weight=2 - -# Create a system user -ynh_system_user_create --username=$app --home_dir="$final_path" - -#================================================= -# CREATE A MYSQL DATABASE -#================================================= -ynh_script_progression --message="Creating a MySQL database..." --weight=2 - -db_name=$(ynh_sanitize_dbid --db_name=$app) -db_user=$db_name -ynh_app_setting_set --app=$app --key=db_name --value=$db_name -ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression --message="Setting up source files..." --weight=3 -ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$final_path" +ynh_setup_source --dest_dir="$install_dir" -chmod 750 "$final_path" -chmod 750 "$final_path/bootstrap/cache" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +chmod 750 "$install_dir/bootstrap/cache" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # PHP-FPM CONFIGURATION @@ -98,7 +44,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 -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # NGINX CONFIGURATION @@ -115,14 +60,12 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Creating a data directory..." --weight=1 -ynh_app_setting_set --app=$app --key=datadir --value=$datadir +mkdir -p $data_dir/uploads +mkdir -p $data_dir/uploads/{big,import,medium,raw,small,thumb} -mkdir -p $datadir/uploads -mkdir -p $datadir/uploads/{big,import,medium,raw,small,thumb} - -chmod 750 "$datadir" -chmod -R o-rwx "$datadir" -chown -R $app:www-data "$datadir" +chmod 750 "$data_dir" +chmod -R o-rwx "$data_dir" +chown -R $app:www-data "$data_dir" #================================================= # INSTALL APP WITH COMPOSER @@ -136,53 +79,25 @@ ynh_install_composer #================================================= ynh_script_progression --message="Adding a configuration file..." -ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env" +ynh_add_config --template="../conf/.env.example" --destination="$install_dir/.env" -chmod 400 "$final_path/.env" -chown $app:$app "$final_path/.env" +chmod 400 "$install_dir/.env" +chown $app:$app "$install_dir/.env" #================================================= # BUILDING #================================================= ynh_script_progression --message="Building..." --weight=10 -pushd $final_path +pushd $install_dir php$phpversion artisan key:generate -n --force --env php$phpversion artisan migrate -n --force php$phpversion artisan config:clear -n php$phpversion artisan config:cache -n - #patch -p1 < "$YNH_CWD/../conf/ffprobe.patch" popd # Setup custom user.css file -ynh_add_config --template="../conf/user.css.example" --destination="$final_path/public/dist/user.css" - -#ynh_replace_string \ -#--match_string="\$ffmpeg = FFMpeg::create();" \ -#--replace_string="\$ffmpeg = FFMpeg::create(array('ffmpeg.binaries' => '/usr/bin/ffmpeg','ffprobe.binaries' => '/usr/bin/ffprobe',));" \ -#--target_file="$final_path/app/Actions/Photo/Extensions/VideoEditing.php" - -#================================================= -# GENERIC FINALIZATION -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Configuring permissions..." --weight=1 - -# Make app public if necessary -if [ $is_public -eq 1 ] -then - # Everyone can access the app. - # The "main" permission is automatically created before the install script. - ynh_permission_update --permission="main" --add="visitors" -fi - -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=2 - -ynh_systemd_action --service_name=nginx --action=reload +ynh_add_config --template="../conf/user.css.example" --destination="$install_dir/public/dist/user.css" #================================================= # END OF SCRIPT diff --git a/scripts/remove b/scripts/remove index 285ab44..61db822 100755 --- a/scripts/remove +++ b/scripts/remove @@ -9,48 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 - -app=$YNH_APP_INSTANCE_NAME - -domain=$(ynh_app_setting_get --app=$app --key=domain) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -datadir=$(ynh_app_setting_get --app=$app --key=datadir) - -#================================================= -# STANDARD REMOVE -#================================================= -# REMOVE THE MYSQL DATABASE -#================================================= -ynh_script_progression --message="Removing the MySQL database..." --weight=2 - -# Remove a database if it exists, along with the associated user -ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name - -#================================================= -# REMOVE APP MAIN DIR -#================================================= -ynh_script_progression --message="Removing app main directory..." --weight=3 - -# Remove the app directory securely -ynh_secure_remove --file="$final_path" - -#================================================= -# REMOVE DATA DIR -#================================================= - -# Remove the data directory if --purge option is used -if [ "${YNH_APP_PURGE:-0}" -eq 1 ] -then - ynh_script_progression --message="Removing app data directory..." - ynh_secure_remove --file="$datadir" -fi - #================================================= # REMOVE NGINX CONFIGURATION #================================================= @@ -59,32 +17,9 @@ 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 -#================================================= -# REMOVE DEPENDENCIES -#================================================= -ynh_script_progression --message="Removing dependencies..." --weight=1 - -# Remove metapackage and its dependencies -ynh_remove_app_dependencies - -#================================================= -# GENERIC FINALIZATION -#================================================= -# REMOVE DEDICATED USER -#================================================= -ynh_script_progression --message="Removing the dedicated system user..." --weight=1 - -# Delete a system user -ynh_system_user_delete --username=$app - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index e96de69..869b1ca 100755 --- a/scripts/restore +++ b/scripts/restore @@ -10,81 +10,25 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading settings..." --weight=1 - -app=$YNH_APP_INSTANCE_NAME - -domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_app_setting_get --app=$app --key=path) -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -datadir=$(ynh_app_setting_get --app=$app --key=datadir) - -fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) -fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) - -#================================================= -# CHECK IF THE APP CAN BE RESTORED -#================================================= -ynh_script_progression --message="Validating restoration parameters..." --weight=1 - -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " - -#================================================= -# STANDARD RESTORATION STEPS -#================================================= -# RECREATE THE DEDICATED USER -#================================================= -ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 - -# Create the dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" - #================================================= # RESTORE THE APP MAIN DIR #================================================= ynh_script_progression --message="Restoring the app main directory..." --weight=2 -ynh_restore_file --origin_path="$final_path" +ynh_restore_file --origin_path="$install_dir" -chmod 750 "$final_path" -chmod 750 "$final_path/bootstrap/cache" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +chmod 750 "$install_dir/bootstrap/cache" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # RESTORE THE DATA DIRECTORY #================================================= ynh_script_progression --message="Restoring the data directory..." -ynh_restore_file --origin_path="$datadir" --not_mandatory +ynh_restore_file --origin_path="$data_dir" --not_mandatory -mkdir -p $datadir - -chmod 750 "$datadir" -chmod -R o-rwx "$datadir" -chown -R $app:www-data "$datadir" - -#================================================= -# REINSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Reinstalling dependencies..." --weight=7 - -# Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies +chown -R $app:www-data "$data_dir" #================================================= # RESTORE THE PHP-FPM CONFIGURATION @@ -96,20 +40,8 @@ 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 web server configuration..." - ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# RESTORE THE MYSQL DATABASE -#================================================= -ynh_script_progression --message="Restoring the MySQL database..." - -db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 12b781f..336ad77 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,47 +9,12 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 - -app=$YNH_APP_INSTANCE_NAME - -domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_app_setting_get --app=$app --key=path) -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name -db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -datadir=$(ynh_app_setting_get --app=$app --key=datadir) -phpversion=$YNH_PHP_VERSION - -fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) -fpm_free_footprint=$(ynh_app_setting_get --app=$app --key=fpm_free_footprint) -fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) - #================================================= # CHECK VERSION #================================================= -ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) -#================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP -#================================================= -ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=3 - -# Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { - # Restore it if the upgrade fails - ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -57,35 +22,14 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 -# If db_name doesn't exist, create it -if [ -z "$db_name" ]; then - db_name=$(ynh_sanitize_dbid --db_name=$app) - ynh_app_setting_set --app=$app --key=db_name --value=$db_name -fi - -# If final_path doesn't exist, create it -if [ -z "$final_path" ]; then - final_path=/var/www/$app - ynh_app_setting_set --app=$app --key=final_path --value=$final_path -fi - -# If datadir doesn't exist, create it -if [ -z "$datadir" ]; then - datadir=/home/yunohost.app/$app - mkdir -p $datadir - chmod 755 $datadir - chown -R $app:www-data $datadir - ynh_app_setting_set --app=$app --key=datadir --value=$datadir -fi - # If new "/home/yunohost.app/$app" doesn't exist, create it if [ -z "/home/yunohost.app/$app" ]; then - datadir=/home/yunohost.app/$app - mkdir -p $datadir - chmod 755 $datadir - chown -R $app:www-data $datadir - ynh_app_setting_set --app=$app --key=datadir --value=$datadir - cp -a "$final_path/public/uploads" "$datadir/uploads" + data_dir=/home/yunohost.app/$app + mkdir -p $data_dir + chmod 755 $data_dir + chown -R $app:www-data $data_dir +#REMOVEME? ynh_app_setting_set --app=$app --key=data_dir --value=$data_dir + cp -a "$install_dir/public/uploads" "$data_dir/uploads" fi # If fpm_footprint doesn't exist, create it @@ -106,21 +50,6 @@ if [ -z "$fpm_usage" ]; then ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage fi -# Cleaning legacy permissions -if ynh_legacy_permissions_exists; then - ynh_legacy_permissions_delete_all - - ynh_app_setting_delete --app=$app --key=is_public -fi - -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 - -# Create a dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -130,20 +59,12 @@ then ynh_script_progression --message="Upgrading source files..." --weight=4 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep=".env public/dist/user.css" + ynh_setup_source --dest_dir="$install_dir" --keep=".env public/dist/user.css" fi -chmod 750 "$final_path" -chmod 750 "$final_path/bootstrap/cache" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" - -#================================================= -# UPGRADE DEPENDENCIES -#================================================= -ynh_script_progression --message="Upgrading dependencies..." --weight=6 - -ynh_install_app_dependencies $pkg_dependencies +chmod 750 "$install_dir/bootstrap/cache" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # PHP-FPM CONFIGURATION @@ -152,7 +73,6 @@ 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 -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # NGINX CONFIGURATION @@ -169,10 +89,10 @@ ynh_add_nginx_config #================================================= #ynh_script_progression --message="Updating a configuration file..." -#ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env" +#ynh_add_config --template="../conf/.env.example" --destination="$install_dir/.env" -#chmod 400 "$final_path/.env" -#chown $app:$app "$final_path/.env" +#chmod 400 "$install_dir/.env" +#chown $app:$app "$install_dir/.env" #================================================= # INSTALL APP WITH COMPOSER @@ -188,29 +108,17 @@ ynh_script_progression --message="Building..." --weight=4 ynh_exec_warn_less ynh_composer_exec --commands="dump-autoload" -pushd $final_path +pushd $install_dir php$phpversion artisan migrate -n --force php$phpversion artisan config:clear -n php$phpversion artisan config:cache -n php$phpversion artisan view:clear popd -#ynh_replace_string \ -#--match_string="\$ffmpeg = FFMpeg::create();" \ -#--replace_string="\$ffmpeg = FFMpeg::create(array('ffmpeg.binaries' => '/usr/bin/ffmpeg','ffprobe.binaries' => '/usr/bin/ffprobe',));" \ -#--target_file="$final_path/app/Actions/Photo/Extensions/VideoEditing.php" - -chmod 750 "$final_path" -chmod 750 "$final_path/bootstrap/cache" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" - -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - -ynh_systemd_action --service_name=nginx --action=reload +chmod 750 "$install_dir" +chmod 750 "$install_dir/bootstrap/cache" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # END OF SCRIPT diff --git a/tests.toml b/tests.toml new file mode 100644 index 0000000..91daf17 --- /dev/null +++ b/tests.toml @@ -0,0 +1,7 @@ +test_format = 1.0 + +[default] + + # ------------ + # Tests to run + # ------------ \ No newline at end of file From 109edd01ebb66e9aafa34fa675072f87db3e6078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Mar 2023 13:22:24 +0100 Subject: [PATCH 025/112] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index bc0b8ed..e33388d 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.7.0~ynh1" +version = "4.7.0~ynh2" maintainers = ["eric_G"] From ff41c390df0d7466a799bba11d8a528976e628ff Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 6 Mar 2023 12:22:29 +0000 Subject: [PATCH 026/112] 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 b2b1edc..d77ae9c 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 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. -**Shipped version:** 4.7.0~ynh1 +**Shipped version:** 4.7.0~ynh2 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index 7aae09d..3782447 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 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. -**Version incluse :** 4.7.0~ynh1 +**Version incluse :** 4.7.0~ynh2 **Démo :** https://lycheeorg.github.io/demo/ From f316904f57dd46e52ff7e470ca96422e666a33e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Mar 2023 19:45:38 +0100 Subject: [PATCH 027/112] Fix --- conf/.env.example | 5 ++--- manifest.toml | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/.env.example b/conf/.env.example index c4219da..b7e956c 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -2,13 +2,12 @@ APP_NAME=Lychee APP_ENV=production APP_KEY= APP_DEBUG=false -APP_URL=http://localhost +APP_URL=https://__DOMAIN____PATH__ +APP_FORCE_HTTPS=true # enable or disable debug bar. By default it is disabled. DEBUGBAR_ENABLED=false -LOG_CHANNEL=stack - ############################################################################## # IMPORTANT: To migrate from Lychee v3 you *MUST* use the same MySQL/MariaDB # # server as v3. # diff --git a/manifest.toml b/manifest.toml index e33388d..3852553 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.7.0~ynh2" +version = "4.7.0~ynh3" maintainers = ["eric_G"] @@ -49,6 +49,7 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" + main.auth_header = false [resources.apt] packages = "mariadb-server ffmpeg php8.1-xml php8.1-imagick php8.1-bcmath php8.1-exif php8.1-mbstring php8.1-gd php8.1-mysqli php8.1-zip php8.1-intl" From 012d9cbc0e3df33027f79f1c0efebdba9f8fdc31 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 6 Mar 2023 18:45:43 +0000 Subject: [PATCH 028/112] 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 d77ae9c..287e827 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 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. -**Shipped version:** 4.7.0~ynh2 +**Shipped version:** 4.7.0~ynh3 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index 3782447..9f81d33 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 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. -**Version incluse :** 4.7.0~ynh2 +**Version incluse :** 4.7.0~ynh3 **Démo :** https://lycheeorg.github.io/demo/ From bebab9de08f380c5ca4676025eb057b607f721f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 14:15:15 +0100 Subject: [PATCH 029/112] 4.7.2 --- conf/app.src | 4 ++-- manifest.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 8b3c2ae..85bc8ab 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/LycheeOrg/Lychee/releases/download/v4.7.0/Lychee.zip -SOURCE_SUM=5b2135a53ee938506e7375f9a63636071d31eebbc143ae9d3c29fb3fb98058fb +SOURCE_URL=https://github.com/LycheeOrg/Lychee/releases/download/v4.7.2/Lychee.zip +SOURCE_SUM=6353db3f2b0963f4a94576c2b16ed7eb7bb2954cd0b0dd745ba4db47998e8df0 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.toml b/manifest.toml index 3852553..def71d6 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.7.0~ynh3" +version = "4.7.2~ynh1" maintainers = ["eric_G"] From ea3f10a1ea899d38a76adda52b1140cbd111965c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 8 Mar 2023 13:15:20 +0000 Subject: [PATCH 030/112] 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 287e827..6bcf2ec 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 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. -**Shipped version:** 4.7.0~ynh3 +**Shipped version:** 4.7.2~ynh1 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index 9f81d33..3c40e9b 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 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. -**Version incluse :** 4.7.0~ynh3 +**Version incluse :** 4.7.2~ynh1 **Démo :** https://lycheeorg.github.io/demo/ From 0cbebadb1bdab5c8c2fd96601df78de72ced7892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 15:48:48 +0100 Subject: [PATCH 031/112] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 9d15733..4ab4945 100755 --- a/scripts/install +++ b/scripts/install @@ -63,7 +63,7 @@ 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} -chmod 750 "$data_dir" +chmod 2775 "$data_dir" chmod -R o-rwx "$data_dir" chown -R $app:www-data "$data_dir" From 83562ed7348d72a58ab618f6a215c6c1445bf0e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 15:55:29 +0100 Subject: [PATCH 032/112] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index def71d6..a0835b1 100644 --- a/manifest.toml +++ b/manifest.toml @@ -52,7 +52,7 @@ ram.runtime = "50M" main.auth_header = false [resources.apt] - packages = "mariadb-server ffmpeg php8.1-xml php8.1-imagick php8.1-bcmath php8.1-exif php8.1-mbstring php8.1-gd php8.1-mysqli php8.1-zip php8.1-intl" + packages = "mariadb-server ffmpeg php8.2-xml php8.2-imagick php8.2-bcmath php8.2-exif php8.2-mbstring php8.2-gd php8.2-mysqli php8.2-zip php8.2-intl" [resources.database] type = "mysql" From 2bb650c2331d69766c4cb30b4bb499a00a4ad108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 15:57:35 +0100 Subject: [PATCH 033/112] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 13781df..1a7049a 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # Composer version -YNH_COMPOSER_VERSION="2.3.5" +YNH_COMPOSER_VERSION="2.5.4" #================================================= # PERSONAL HELPERS From 7461d264d4cbb90d564392d37556c9d3beb26324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 15:58:19 +0100 Subject: [PATCH 034/112] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 4ab4945..2e848c1 100755 --- a/scripts/install +++ b/scripts/install @@ -65,7 +65,7 @@ mkdir -p $data_dir/uploads/{big,import,medium,raw,small,thumb} chmod 2775 "$data_dir" chmod -R o-rwx "$data_dir" -chown -R $app:www-data "$data_dir" +chown -R $app:$app "$data_dir" #================================================= # INSTALL APP WITH COMPOSER From 3775a41f6d0bc7ffdd790839fb99c8d115e5da59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 16:02:03 +0100 Subject: [PATCH 035/112] Update install --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index 2e848c1..c2c9317 100755 --- a/scripts/install +++ b/scripts/install @@ -36,6 +36,7 @@ ynh_setup_source --dest_dir="$install_dir" chmod 750 "$install_dir/bootstrap/cache" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" +chown -R $app: "$install_dir/public/sym/" #================================================= # PHP-FPM CONFIGURATION From 0cd97bd68ccfac5f90fee9525b17313ed3d717a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 16:06:03 +0100 Subject: [PATCH 036/112] Update .env.example --- conf/.env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/.env.example b/conf/.env.example index b7e956c..4265b91 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -28,7 +28,7 @@ DB_USERNAME=__DB_USER__ DB_PASSWORD=__DB_PWD__ DB_LOG_SQL=false -TIMEZONE=UTC +TIMEZONE=__TIMEZONE__ # folders in which the files will be stored LYCHEE_DIST="__INSTALL_DIR__/public/dist/" From 69098ad15a8ab2fafac4d73b4534fd0248d56ab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 16:06:08 +0100 Subject: [PATCH 037/112] Update install --- scripts/install | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/install b/scripts/install index c2c9317..3b50f00 100755 --- a/scripts/install +++ b/scripts/install @@ -17,6 +17,8 @@ fpm_footprint="low" fpm_free_footprint=0 fpm_usage="low" +timezone="$(cat /etc/timezone)" + #================================================= # STORE SETTINGS FROM MANIFEST #================================================= From 035d57b0998850bfeb5d861cec89b2fe2ace3ab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 16:21:22 +0100 Subject: [PATCH 038/112] Update install --- scripts/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 3b50f00..f80242c 100755 --- a/scripts/install +++ b/scripts/install @@ -66,9 +66,9 @@ 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} -chmod 2775 "$data_dir" -chmod -R o-rwx "$data_dir" -chown -R $app:$app "$data_dir" +chmod 2775 "$data_dir/uploads/" +chmod -R o-rwx "$data_dir/uploads/" +chown -R $app:$app "$data_dir/uploads/" #================================================= # INSTALL APP WITH COMPOSER From d1fffbd73c45efe718d0cfa25cabf10b9ab5b594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 16:26:07 +0100 Subject: [PATCH 039/112] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index f80242c..614b051 100755 --- a/scripts/install +++ b/scripts/install @@ -66,7 +66,7 @@ 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} -chmod 2775 "$data_dir/uploads/" +chmod 2775 "$data_dir/uploads" chmod -R o-rwx "$data_dir/uploads/" chown -R $app:$app "$data_dir/uploads/" From 976e10156e64d8fdc9f67299fde09f429db927a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 16:35:19 +0100 Subject: [PATCH 040/112] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 614b051..b97dc7d 100755 --- a/scripts/install +++ b/scripts/install @@ -66,7 +66,7 @@ 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} -chmod 2775 "$data_dir/uploads" +chmod 2775 "$data_dir/uploads/{big,import,medium,raw,small,thumb}" chmod -R o-rwx "$data_dir/uploads/" chown -R $app:$app "$data_dir/uploads/" From 4c8af64c1956d56f9e347ef3656e400a5ab175a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 16:40:23 +0100 Subject: [PATCH 041/112] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index b97dc7d..3dc10d5 100755 --- a/scripts/install +++ b/scripts/install @@ -66,7 +66,7 @@ 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} -chmod 2775 "$data_dir/uploads/{big,import,medium,raw,small,thumb}" +chmod -R 2775 "$data_dir/uploads/" chmod -R o-rwx "$data_dir/uploads/" chown -R $app:$app "$data_dir/uploads/" From 0bf4ad1dc0f8b68027c011ae6f006306a0303c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 16:47:13 +0100 Subject: [PATCH 042/112] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 3dc10d5..b6d3773 100755 --- a/scripts/install +++ b/scripts/install @@ -66,7 +66,7 @@ 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} -chmod -R 2775 "$data_dir/uploads/" +chmod 775 "$data_dir/uploads/" chmod -R o-rwx "$data_dir/uploads/" chown -R $app:$app "$data_dir/uploads/" From f7b1fdd27fdb3d33f4ea2f2c935cf4726de9ff67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 17:06:46 +0100 Subject: [PATCH 043/112] Update install --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index b6d3773..0278809 100755 --- a/scripts/install +++ b/scripts/install @@ -67,6 +67,7 @@ mkdir -p $data_dir/uploads mkdir -p $data_dir/uploads/{big,import,medium,raw,small,thumb} chmod 775 "$data_dir/uploads/" +chmod 0775 "$data_dir/uploads/import/" chmod -R o-rwx "$data_dir/uploads/" chown -R $app:$app "$data_dir/uploads/" From 84eab019208a068cdcfa116926349f2ffc870db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 17:06:55 +0100 Subject: [PATCH 044/112] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 0278809..7da6032 100755 --- a/scripts/install +++ b/scripts/install @@ -67,7 +67,7 @@ mkdir -p $data_dir/uploads mkdir -p $data_dir/uploads/{big,import,medium,raw,small,thumb} chmod 775 "$data_dir/uploads/" -chmod 0775 "$data_dir/uploads/import/" +chmod 2775 "$data_dir/uploads/import/" chmod -R o-rwx "$data_dir/uploads/" chown -R $app:$app "$data_dir/uploads/" From 56b5221c732b27d25ea7a13fa7fc1ed18e5e87be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 19:03:14 +0100 Subject: [PATCH 045/112] Fix --- conf/.env.example | 52 +++++++++++++++++++++++++++++++++++------------ conf/nginx.conf | 2 +- scripts/install | 3 +-- 3 files changed, 41 insertions(+), 16 deletions(-) diff --git a/conf/.env.example b/conf/.env.example index 4265b91..52aede9 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -28,23 +28,47 @@ DB_USERNAME=__DB_USER__ DB_PASSWORD=__DB_PWD__ DB_LOG_SQL=false +# List foreign keys in diagnostic page +DB_LIST_FOREIGN_KEYS=true + +# Application timezone. If not specified, the server's default timezone is used. +# Requires a named timezone identifier. +# See https://www.php.net/manual/en/timezones.php for the list of supported timezones. +# Don't use a timezone offset (like +01:00) or a timezone abbreviation (like CEST) TIMEZONE=__TIMEZONE__ +# Visibility of directories and (media) files in LYCHEE_UPLOADS +# Possible values are: +# +# - private: world group has neither read nor write access +# - public: world group has read access but no write access (the default) +# - world: world group has read and write access +# +# The default should suffice for most installations. +# For improved security, change this setting to "private". +# Some rare setups may require directories and files to be world writeable. +# In this case, use "world" here. +# USE WITH PRECAUTIONS: world writeable files and folders may be a SECURITY RISK. +LYCHEE_IMAGE_VISIBILITY=public + # folders in which the files will be stored -LYCHEE_DIST="__INSTALL_DIR__/public/dist/" LYCHEE_UPLOADS="__DATA_DIR__/uploads/" - +LYCHEE_DIST="__INSTALL_DIR__/public/dist/" +# LYCHEE_SYM="/var/www/html/Lychee-Laravel/public/sym/" # url to access those files -# LYCHEE_DIST_URL="dist/" # LYCHEE_UPLOADS_URL="uploads/" +# LYCHEE_DIST_URL="dist/" +# LYCHEE_SYM_URL="sym/" + +# Support for token based authentication used by API requests. Enabled by default. +ENABLE_TOKEN_AUTH=false -BROADCAST_DRIVER=log CACHE_DRIVER=file SESSION_DRIVER=file SESSION_LIFETIME=120 -QUEUE_DRIVER=sync SECURITY_HEADER_HSTS_ENABLE=false +SESSION_SECURE_COOKIE=false REDIS_HOST=127.0.0.1 REDIS_PASSWORD=null @@ -56,13 +80,15 @@ MAIL_PORT= MAIL_USERNAME= MAIL_PASSWORD= MAIL_ENCRYPTION= +MAIL_FROM_NAME= +MAIL_FROM_ADDRESS= -PUSHER_APP_ID= -PUSHER_APP_KEY= -PUSHER_APP_SECRET= -PUSHER_APP_CLUSTER=mt1 +# The trusted proxies if Lychee is behind a reverse proxy +# Accepted values: +# - `null`: no proxy +# - `*`: any proxy +# - [,]: a comma-seperated list of IP addresses +TRUSTED_PROXIES=null -MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" -MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" - -ENABLE_TOKEN_AUTH=false +# Comma-separated list of class names of diagnostics checks that should be skipped. +#SKIP_DIAGNOSTICS_CHECKS= diff --git a/conf/nginx.conf b/conf/nginx.conf index ece5e5f..5570236 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -26,7 +26,7 @@ location ^~ __PATH__/ { } location __PATH__/uploads/ { - alias __DATA_DIR__/uploads/ ; + alias __DATA_DIR__/uploads/; } # Include SSOWAT user panel. diff --git a/scripts/install b/scripts/install index 7da6032..5241276 100755 --- a/scripts/install +++ b/scripts/install @@ -66,8 +66,7 @@ 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} -chmod 775 "$data_dir/uploads/" -chmod 2775 "$data_dir/uploads/import/" +chmod 770 "$data_dir/uploads/" chmod -R o-rwx "$data_dir/uploads/" chown -R $app:$app "$data_dir/uploads/" From f85c7eb62188b6aff20b853fe2e57e68ce002245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 19:29:50 +0100 Subject: [PATCH 046/112] Update install --- scripts/install | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/install b/scripts/install index 5241276..438e4b6 100755 --- a/scripts/install +++ b/scripts/install @@ -102,6 +102,11 @@ popd # Setup custom user.css file ynh_add_config --template="../conf/user.css.example" --destination="$install_dir/public/dist/user.css" + +chgrp www-data -R $install_dir/storage $install_dir/public/dist $install_dir/public/sym $data_dir/uploads +chmod -R 775 $install_dir/storage/* $install_dir/app/* $install_dir/public/dist $install_dir/public/sym $data_dir/uploads $install_dir/bootstrap/ +chmod 775 $install_dir/. + #================================================= # END OF SCRIPT #================================================= From 3479591a0cf9ef76659871f7351d01f1e601f8b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 19:32:52 +0100 Subject: [PATCH 047/112] Update install --- scripts/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 438e4b6..d47b35b 100755 --- a/scripts/install +++ b/scripts/install @@ -103,9 +103,9 @@ popd ynh_add_config --template="../conf/user.css.example" --destination="$install_dir/public/dist/user.css" -chgrp www-data -R $install_dir/storage $install_dir/public/dist $install_dir/public/sym $data_dir/uploads -chmod -R 775 $install_dir/storage/* $install_dir/app/* $install_dir/public/dist $install_dir/public/sym $data_dir/uploads $install_dir/bootstrap/ -chmod 775 $install_dir/. +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/ +chmod 2775 $install_dir/. #================================================= # END OF SCRIPT From b58da1a74812de90068bdedbd1d4d6ffe16b749d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 19:35:57 +0100 Subject: [PATCH 048/112] Update .env.example --- conf/.env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/.env.example b/conf/.env.example index 52aede9..4289340 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -29,7 +29,7 @@ DB_PASSWORD=__DB_PWD__ DB_LOG_SQL=false # List foreign keys in diagnostic page -DB_LIST_FOREIGN_KEYS=true +#DB_LIST_FOREIGN_KEYS=true # Application timezone. If not specified, the server's default timezone is used. # Requires a named timezone identifier. From 2c4f09eb9bd7e78cb3f40c9816d782a9008e0aaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 19:36:42 +0100 Subject: [PATCH 049/112] Update install --- scripts/install | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/scripts/install b/scripts/install index d47b35b..7ef81b1 100755 --- a/scripts/install +++ b/scripts/install @@ -66,9 +66,13 @@ 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} -chmod 770 "$data_dir/uploads/" -chmod -R o-rwx "$data_dir/uploads/" -chown -R $app:$app "$data_dir/uploads/" +#chmod 770 "$data_dir/uploads/" +#chmod -R o-rwx "$data_dir/uploads/" +#chown -R $app:$app "$data_dir/uploads/" + +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/ +chmod 2775 $install_dir/. #================================================= # INSTALL APP WITH COMPOSER @@ -102,11 +106,6 @@ popd # Setup custom user.css file ynh_add_config --template="../conf/user.css.example" --destination="$install_dir/public/dist/user.css" - -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/ -chmod 2775 $install_dir/. - #================================================= # END OF SCRIPT #================================================= From 15c453bedc810ec7336116e132014a6d3e4842c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 19:36:58 +0100 Subject: [PATCH 050/112] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 7ef81b1..5525cb6 100755 --- a/scripts/install +++ b/scripts/install @@ -72,7 +72,7 @@ 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/ -chmod 2775 $install_dir/. +#chmod 2775 $install_dir/. #================================================= # INSTALL APP WITH COMPOSER From b103e06c4c1de7ba8e9f4caa88800c153c9462fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 19:40:04 +0100 Subject: [PATCH 051/112] Update install --- scripts/install | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/install b/scripts/install index 5525cb6..aea2ea2 100755 --- a/scripts/install +++ b/scripts/install @@ -66,13 +66,8 @@ 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} -#chmod 770 "$data_dir/uploads/" -#chmod -R o-rwx "$data_dir/uploads/" -#chown -R $app:$app "$data_dir/uploads/" - 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/ -#chmod 2775 $install_dir/. #================================================= # INSTALL APP WITH COMPOSER From cc2a6243144c5a64776210c50d97c988dc0587d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 19:40:31 +0100 Subject: [PATCH 052/112] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index a0835b1..750154d 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.7.2~ynh1" +version = "4.7.2~ynh2" maintainers = ["eric_G"] From 592c9e12fc8a486588822291667cf5d5bfc5d389 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 8 Mar 2023 18:40:36 +0000 Subject: [PATCH 053/112] 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 6bcf2ec..59014f9 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 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. -**Shipped version:** 4.7.2~ynh1 +**Shipped version:** 4.7.2~ynh2 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index 3c40e9b..bf1ac27 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 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. -**Version incluse :** 4.7.2~ynh1 +**Version incluse :** 4.7.2~ynh2 **Démo :** https://lycheeorg.github.io/demo/ From b7839b6538d21e868e7b031df3c466254e9e5e92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 10 Mar 2023 20:17:35 +0100 Subject: [PATCH 054/112] 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 a4bfb35563ec17ef8189cc7c45d8f908bb1247c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 10 Mar 2023 20:17:48 +0100 Subject: [PATCH 055/112] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 750154d..513760f 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.7.2~ynh2" +version = "4.7.2~ynh3" maintainers = ["eric_G"] From c9a0f6a5c98c8adf3b338036b3c4f2a5c361d7b3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 10 Mar 2023 19:17:53 +0000 Subject: [PATCH 056/112] 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 59014f9..5919b0e 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 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. -**Shipped version:** 4.7.2~ynh2 +**Shipped version:** 4.7.2~ynh3 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index bf1ac27..e4b8d74 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 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. -**Version incluse :** 4.7.2~ynh2 +**Version incluse :** 4.7.2~ynh3 **Démo :** https://lycheeorg.github.io/demo/ From 76d458536fc95a135aca85d12a57fbfcc6c4e52b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 15 Mar 2023 15:58:09 +0100 Subject: [PATCH 057/112] Update upgrade --- scripts/upgrade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 336ad77..aedb550 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,19 +33,19 @@ if [ -z "/home/yunohost.app/$app" ]; then fi # If fpm_footprint doesn't exist, create it -if [ -z "$fpm_footprint" ]; then +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 +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 +if [ -z "${fpm_usage:-}" ]; then fpm_usage=low ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage fi From ec865e6bc16f0587665ba077c6999dadc2760335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 15 Mar 2023 15:59:29 +0100 Subject: [PATCH 058/112] Update manifest.toml --- manifest.toml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 513760f..88bd82d 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.7.2~ynh3" +version = "4.7.2~ynh4" maintainers = ["eric_G"] @@ -41,6 +41,13 @@ ram.runtime = "50M" default = "visitors" [resources] + + [resources.sources] + + [resources.sources.main] + url = "https://github.com/LycheeOrg/Lychee/releases/download/v4.7.2/Lychee.zip" + sha256 = "6353db3f2b0963f4a94576c2b16ed7eb7bb2954cd0b0dd745ba4db47998e8df0" + [resources.system_user] [resources.install_dir] From 110b01118b8065b35d82e526cf4fd77cb8cf2788 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 15 Mar 2023 14:59:34 +0000 Subject: [PATCH 059/112] 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 5919b0e..ac2c921 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 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. -**Shipped version:** 4.7.2~ynh3 +**Shipped version:** 4.7.2~ynh4 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index e4b8d74..24325a7 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 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. -**Version incluse :** 4.7.2~ynh3 +**Version incluse :** 4.7.2~ynh4 **Démo :** https://lycheeorg.github.io/demo/ From 0a0af4b7ee36bb9641aa227f18d10ff1bfb68cdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 15 Mar 2023 16:00:09 +0100 Subject: [PATCH 060/112] Delete app.src --- conf/app.src | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 conf/app.src diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index 85bc8ab..0000000 --- a/conf/app.src +++ /dev/null @@ -1,7 +0,0 @@ -SOURCE_URL=https://github.com/LycheeOrg/Lychee/releases/download/v4.7.2/Lychee.zip -SOURCE_SUM=6353db3f2b0963f4a94576c2b16ed7eb7bb2954cd0b0dd745ba4db47998e8df0 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=zip -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= -SOURCE_EXTRACT=true From 9042c6b734a4cfce692330edeb7028c672dd2eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 15 Mar 2023 16:01:42 +0100 Subject: [PATCH 061/112] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 88bd82d..fc6a130 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://lycheeorg.github.io/docs/" code = "https://github.com/LycheeOrg/Lychee" [integration] -yunohost = ">= 11.1.13" +yunohost = ">= 11.1.15" architectures = "all" multi_instance = true ldap = false From 4770769024e20258084463c7bed57cd60eca3ab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 4 May 2023 19:33:20 +0200 Subject: [PATCH 062/112] Update manifest.toml --- manifest.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index fc6a130..2f078ca 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.7.2~ynh4" +version = "4.7.4~ynh1" maintainers = ["eric_G"] @@ -17,7 +17,7 @@ admindoc = "https://lycheeorg.github.io/docs/" code = "https://github.com/LycheeOrg/Lychee" [integration] -yunohost = ">= 11.1.15" +yunohost = ">= 11.1.18" architectures = "all" multi_instance = true ldap = false @@ -45,8 +45,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/LycheeOrg/Lychee/releases/download/v4.7.2/Lychee.zip" - sha256 = "6353db3f2b0963f4a94576c2b16ed7eb7bb2954cd0b0dd745ba4db47998e8df0" + url = "https://github.com/LycheeOrg/Lychee/releases/download/v4.7.4/Lychee.zip" + sha256 = "e36e4864760c9dd401cd2bba56e4a989e09bdc0352a7d1f56c8cd3a5b0a7f7f5" [resources.system_user] From c68b05866567ae1c4b4c79835188a1bd330fade2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 4 May 2023 17:33:25 +0000 Subject: [PATCH 063/112] 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 ac2c921..064b79b 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 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. -**Shipped version:** 4.7.2~ynh4 +**Shipped version:** 4.7.4~ynh1 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index 24325a7..40543da 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 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. -**Version incluse :** 4.7.2~ynh4 +**Version incluse :** 4.7.4~ynh1 **Démo :** https://lycheeorg.github.io/demo/ From 1e86b80eb83b44c1013e02e2a65a100d24682f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 4 May 2023 19:34:55 +0200 Subject: [PATCH 064/112] add sudir (#68) --- manifest.toml | 1 + scripts/install | 4 ++-- scripts/upgrade | 10 ---------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/manifest.toml b/manifest.toml index 2f078ca..0caf3ef 100644 --- a/manifest.toml +++ b/manifest.toml @@ -53,6 +53,7 @@ ram.runtime = "50M" [resources.install_dir] [resources.data_dir] + subdirs = ["uploads/big", "uploads/import", "uploads/medium", "uploads/raw", "uploads/small", "uploads/thumb"] [resources.permissions] main.url = "/" diff --git a/scripts/install b/scripts/install index aea2ea2..cc26796 100755 --- a/scripts/install +++ b/scripts/install @@ -63,8 +63,8 @@ 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} +#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/ diff --git a/scripts/upgrade b/scripts/upgrade index aedb550..9749585 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,16 +22,6 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 -# If new "/home/yunohost.app/$app" doesn't exist, create it -if [ -z "/home/yunohost.app/$app" ]; then - data_dir=/home/yunohost.app/$app - mkdir -p $data_dir - chmod 755 $data_dir - chown -R $app:www-data $data_dir -#REMOVEME? ynh_app_setting_set --app=$app --key=data_dir --value=$data_dir - cp -a "$install_dir/public/uploads" "$data_dir/uploads" -fi - # If fpm_footprint doesn't exist, create it if [ -z "${fpm_footprint:-}" ]; then fpm_footprint=low From 0ab99d524d819e532ff676973e5493aded8238d8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 6 May 2023 07:50:57 +0200 Subject: [PATCH 065/112] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 0caf3ef..2147ad2 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.7.4~ynh1" +version = "4.8.0~ynh1" maintainers = ["eric_G"] @@ -45,8 +45,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/LycheeOrg/Lychee/releases/download/v4.7.4/Lychee.zip" - sha256 = "e36e4864760c9dd401cd2bba56e4a989e09bdc0352a7d1f56c8cd3a5b0a7f7f5" + url = "https://github.com/LycheeOrg/Lychee/releases/download/v4.8.0/Lychee.zip" + sha256 = "b4d0a5318eabce313a088144a7e750c8619fa0b29cebc1bc427af16faffefdcd" [resources.system_user] From 878e29144fd3f4d74378bcddaf2f2884e60dc4e0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 6 May 2023 05:51:02 +0000 Subject: [PATCH 066/112] 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 064b79b..cd2ff0d 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 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. -**Shipped version:** 4.7.4~ynh1 +**Shipped version:** 4.8.0~ynh1 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index 40543da..c3f65b8 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 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. -**Version incluse :** 4.7.4~ynh1 +**Version incluse :** 4.8.0~ynh1 **Démo :** https://lycheeorg.github.io/demo/ From 6f4ee2232b2a1a3e979a07188087a2cbfa05155c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 10 May 2023 18:05:35 +0200 Subject: [PATCH 067/112] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 2147ad2..e44ea35 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://lycheeorg.github.io/docs/" code = "https://github.com/LycheeOrg/Lychee" [integration] -yunohost = ">= 11.1.18" +yunohost = ">= 11.1.19" architectures = "all" multi_instance = true ldap = false From bdb38a1cf50a604328c4097e7f687d22a653542b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 10 May 2023 18:16:08 +0200 Subject: [PATCH 068/112] Update install --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index cc26796..913aeb2 100755 --- a/scripts/install +++ b/scripts/install @@ -39,6 +39,7 @@ chmod 750 "$install_dir/bootstrap/cache" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" chown -R $app: "$install_dir/public/sym/" +chmod -R 755 $data_dir #================================================= # PHP-FPM CONFIGURATION From 6ce614cd6e0d20fb48317d7f0895fda8bbd61137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 10 May 2023 23:03:50 +0200 Subject: [PATCH 069/112] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index e44ea35..42194b9 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.8.0~ynh1" +version = "4.8.0~ynh2" maintainers = ["eric_G"] From ca36c2cfa993c6128541e1900fdc4958d891dcd5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 10 May 2023 21:03:55 +0000 Subject: [PATCH 070/112] 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 cd2ff0d..e81faa6 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 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. -**Shipped version:** 4.8.0~ynh1 +**Shipped version:** 4.8.0~ynh2 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index c3f65b8..c318df7 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 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. -**Version incluse :** 4.8.0~ynh1 +**Version incluse :** 4.8.0~ynh2 **Démo :** https://lycheeorg.github.io/demo/ From 55678c8244b260dfc0041e7f804bca657991601a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 10 May 2023 21:04:31 +0000 Subject: [PATCH 071/112] Auto-update README --- README_fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README_fr.md b/README_fr.md index c740009..c318df7 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,6 +17,7 @@ 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. + **Version incluse :** 4.8.0~ynh2 **Démo :** https://lycheeorg.github.io/demo/ From 4c285941d5458c5c2c43bf8d6b88bad5bbb93e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 10 May 2023 23:05:04 +0200 Subject: [PATCH 072/112] Update upgrade --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 9749585..4169774 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -55,6 +55,7 @@ fi chmod 750 "$install_dir/bootstrap/cache" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" +chmod -R 755 $data_dir #================================================= # PHP-FPM CONFIGURATION From d7f1109d8f74fa121a686f13352729c49ff4dc6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 15 May 2023 18:42:10 +0200 Subject: [PATCH 073/112] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 42194b9..3e398d4 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.8.0~ynh2" +version = "4.8.1~ynh1" maintainers = ["eric_G"] @@ -45,8 +45,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/LycheeOrg/Lychee/releases/download/v4.8.0/Lychee.zip" - sha256 = "b4d0a5318eabce313a088144a7e750c8619fa0b29cebc1bc427af16faffefdcd" + url = "https://github.com/LycheeOrg/Lychee/releases/download/v4.8.1/Lychee.zip" + sha256 = "d964031191686fa34aaeb920968f2e551138375df31b89ce9e61fa640bb0a7e6" [resources.system_user] From 5693843ee2489758e4e62576b3d7fd2a8da16458 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 15 May 2023 16:42:14 +0000 Subject: [PATCH 074/112] 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 e81faa6..37c114d 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 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. -**Shipped version:** 4.8.0~ynh2 +**Shipped version:** 4.8.1~ynh1 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index c318df7..1156bd4 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 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. -**Version incluse :** 4.8.0~ynh2 +**Version incluse :** 4.8.1~ynh1 **Démo :** https://lycheeorg.github.io/demo/ From 8cda9f6cd6fcd676b79e884775a3524dc3048322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 19 May 2023 08:52:15 +0200 Subject: [PATCH 075/112] Update manifest.toml --- manifest.toml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 3e398d4..c4ef929 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.8.1~ynh1" +version = "4.9.0~ynh1" maintainers = ["eric_G"] @@ -45,8 +45,9 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/LycheeOrg/Lychee/releases/download/v4.8.1/Lychee.zip" - sha256 = "d964031191686fa34aaeb920968f2e551138375df31b89ce9e61fa640bb0a7e6" + url = "https://github.com/LycheeOrg/Lychee/releases/download/v4.9.0/Lychee.zip" + sha256 = "9043bb567993ec3df7b185de4586f1d5f042b07f24fcac5aa67de8fc43ee9b5f" + autoupdate.strategy = "latest_github_tag" [resources.system_user] From 378265c52d4e590124cc551fd57baffec07fabd6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 19 May 2023 06:52:20 +0000 Subject: [PATCH 076/112] 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 37c114d..43e8000 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 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. -**Shipped version:** 4.8.1~ynh1 +**Shipped version:** 4.9.0~ynh1 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index 1156bd4..e6ccf5c 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 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. -**Version incluse :** 4.8.1~ynh1 +**Version incluse :** 4.9.0~ynh1 **Démo :** https://lycheeorg.github.io/demo/ From 78bf7441de6dc8523f2fade4b241882eeb3331d7 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Sat, 20 May 2023 22:03:32 +0200 Subject: [PATCH 077/112] Upgrade to v4.9.1 (#74) * Upgrade to v4.9.1 * Auto-update README --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 43e8000..9781102 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 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. -**Shipped version:** 4.9.0~ynh1 +**Shipped version:** 4.9.1~ynh1 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index e6ccf5c..f72dbfd 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 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. -**Version incluse :** 4.9.0~ynh1 +**Version incluse :** 4.9.1~ynh1 **Démo :** https://lycheeorg.github.io/demo/ diff --git a/manifest.toml b/manifest.toml index c4ef929..768bdbe 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.9.0~ynh1" +version = "4.9.1~ynh1" maintainers = ["eric_G"] @@ -45,8 +45,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/LycheeOrg/Lychee/releases/download/v4.9.0/Lychee.zip" - sha256 = "9043bb567993ec3df7b185de4586f1d5f042b07f24fcac5aa67de8fc43ee9b5f" + url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v4.9.1.tar.gz" + sha256 = "07d6487cab62e57df0b2ca06dd371c076df919ad491fd5ca9f6f354b483541f0" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 79aa6358ee22a41c5a306d1b364f76f30f47b22e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 22 May 2023 11:30:53 +0200 Subject: [PATCH 078/112] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 768bdbe..2fe8041 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.9.1~ynh1" +version = "4.9.2~ynh1" maintainers = ["eric_G"] @@ -45,8 +45,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v4.9.1.tar.gz" - sha256 = "07d6487cab62e57df0b2ca06dd371c076df919ad491fd5ca9f6f354b483541f0" + url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v4.9.2.tar.gz" + sha256 = "0d5f870799244ee993f509f2b89599cdb965ff865869cef829539427eef7d4eb" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 09814a51598cc0b3528346097df8251b4e5cc9f5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 22 May 2023 09:30:58 +0000 Subject: [PATCH 079/112] 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 9781102..125bfb7 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 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. -**Shipped version:** 4.9.1~ynh1 +**Shipped version:** 4.9.2~ynh1 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index f72dbfd..0f24efc 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 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. -**Version incluse :** 4.9.1~ynh1 +**Version incluse :** 4.9.2~ynh1 **Démo :** https://lycheeorg.github.io/demo/ From 7a56258b7efc556a4b28fecb3dd152c4e30c5a89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 25 Jun 2023 15:33:19 +0200 Subject: [PATCH 080/112] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 2fe8041..9620822 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.9.2~ynh1" +version = "4.9.3~ynh1" maintainers = ["eric_G"] @@ -45,8 +45,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v4.9.2.tar.gz" - sha256 = "0d5f870799244ee993f509f2b89599cdb965ff865869cef829539427eef7d4eb" + url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v4.9.3.tar.gz" + sha256 = "b90405d78d8180823bb36a257e2fe5324f9c9add07263adc7dfe663e59b1fe96" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 49400d5ffbf60467a7d637413039eef8f23e7751 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 25 Jun 2023 13:33:24 +0000 Subject: [PATCH 081/112] 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 125bfb7..a611421 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 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. -**Shipped version:** 4.9.2~ynh1 +**Shipped version:** 4.9.3~ynh1 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index 0f24efc..bdd0943 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 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. -**Version incluse :** 4.9.2~ynh1 +**Version incluse :** 4.9.3~ynh1 **Démo :** https://lycheeorg.github.io/demo/ From b0cb1bd4616b6aecde8577c31e9162eec2425f2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 25 Jun 2023 15:34:14 +0200 Subject: [PATCH 082/112] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 9620822..8915513 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://lycheeorg.github.io/docs/" code = "https://github.com/LycheeOrg/Lychee" [integration] -yunohost = ">= 11.1.19" +yunohost = ">= 11.1.21" architectures = "all" multi_instance = true ldap = false From 21eb29e892385a10d0d17db393735f4528ecaa3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 28 Jun 2023 21:47:05 +0200 Subject: [PATCH 083/112] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 8915513..9633a84 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.9.3~ynh1" +version = "4.9.4~ynh1" maintainers = ["eric_G"] @@ -45,8 +45,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v4.9.3.tar.gz" - sha256 = "b90405d78d8180823bb36a257e2fe5324f9c9add07263adc7dfe663e59b1fe96" + url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v4.9.4.tar.gz" + sha256 = "9100e4293ba218df4b649912f3110474d557d06dfe88f5468a23669ac157d71b" autoupdate.strategy = "latest_github_tag" [resources.system_user] From fad0db513d2129659c13078fecda135b8b6798db Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 28 Jun 2023 19:47:09 +0000 Subject: [PATCH 084/112] 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 a611421..a35d8fe 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 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. -**Shipped version:** 4.9.3~ynh1 +**Shipped version:** 4.9.4~ynh1 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index bdd0943..369273b 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 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. -**Version incluse :** 4.9.3~ynh1 +**Version incluse :** 4.9.4~ynh1 **Démo :** https://lycheeorg.github.io/demo/ From 97610bdf03f808752aa4aaaab47f8adf2ab72397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 2 Aug 2023 19:02:13 +0200 Subject: [PATCH 085/112] Update manifest.toml --- manifest.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index 9633a84..7e09446 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.9.4~ynh1" +version = "4.10.0~ynh1" maintainers = ["eric_G"] @@ -17,7 +17,7 @@ admindoc = "https://lycheeorg.github.io/docs/" code = "https://github.com/LycheeOrg/Lychee" [integration] -yunohost = ">= 11.1.21" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = false @@ -45,8 +45,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v4.9.4.tar.gz" - sha256 = "9100e4293ba218df4b649912f3110474d557d06dfe88f5468a23669ac157d71b" + url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v4.10.0.tar.gz" + sha256 = "ec1769f6d086e03dfcb146e84af97bc8ae389cad179009d67243a63e6ae92a10" autoupdate.strategy = "latest_github_tag" [resources.system_user] From fbcd1176bd93c40776a6919a1d200de8cdc5707d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 2 Aug 2023 17:02:18 +0000 Subject: [PATCH 086/112] 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 a35d8fe..4556694 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 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. -**Shipped version:** 4.9.4~ynh1 +**Shipped version:** 4.10.0~ynh1 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index 369273b..1fad6a8 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 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. -**Version incluse :** 4.9.4~ynh1 +**Version incluse :** 4.10.0~ynh1 **Démo :** https://lycheeorg.github.io/demo/ From 1dcf34aab00978eb2e1b7599449c2e74ed5ec117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 11 Aug 2023 11:35:43 +0200 Subject: [PATCH 087/112] fix --- conf/extra_php-fpm.conf | 4 ++-- conf/nginx.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf index 9dacb8a..1f6b70e 100644 --- a/conf/extra_php-fpm.conf +++ b/conf/extra_php-fpm.conf @@ -1,4 +1,4 @@ ; Additional php.ini defines, specific to this pool of workers. -php_admin_value[upload_max_filesize] = 512M -php_admin_value[post_max_size] = 512M +php_admin_value[upload_max_filesize] = 1G +php_admin_value[post_max_size] = 1G diff --git a/conf/nginx.conf b/conf/nginx.conf index 5570236..eb0645b 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -7,7 +7,7 @@ location ^~ __PATH__/ { index index.php; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file - client_max_body_size 512M; + client_max_body_size 1G; try_files $uri $uri/ __PATH__/__PATH__/index.php?$query_string; From 6422c2bc15a74b7b1d097dda5ba34ca1343320dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 13 Aug 2023 12:33:01 +0200 Subject: [PATCH 088/112] 4.11.0 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 7e09446..c53a2ac 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.10.0~ynh1" +version = "4.11.0~ynh1" maintainers = ["eric_G"] @@ -45,8 +45,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v4.10.0.tar.gz" - sha256 = "ec1769f6d086e03dfcb146e84af97bc8ae389cad179009d67243a63e6ae92a10" + url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v4.11.0.tar.gz" + sha256 = "201928cfb149a162af3de454328aa239dbbb38b9fbd46c053ead8fc4c6635de9" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 8e39b01d67843e108dc560214c783d45856e96d8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 13 Aug 2023 10:33:05 +0000 Subject: [PATCH 089/112] 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 4556694..d2ac790 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 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. -**Shipped version:** 4.10.0~ynh1 +**Shipped version:** 4.11.0~ynh1 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index 1fad6a8..26cb101 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 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. -**Version incluse :** 4.10.0~ynh1 +**Version incluse :** 4.11.0~ynh1 **Démo :** https://lycheeorg.github.io/demo/ From 859c569f5a741ca95aee015e61b0c781ebb3ef10 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Sun, 3 Sep 2023 23:01:59 +0200 Subject: [PATCH 090/112] Upgrade to v4.11.1 (#83) * Upgrade to v4.11.1 * Auto-update README --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d2ac790..c5051d0 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 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. -**Shipped version:** 4.11.0~ynh1 +**Shipped version:** 4.11.1~ynh1 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index 26cb101..1071290 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 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. -**Version incluse :** 4.11.0~ynh1 +**Version incluse :** 4.11.1~ynh1 **Démo :** https://lycheeorg.github.io/demo/ diff --git a/manifest.toml b/manifest.toml index c53a2ac..648b7d7 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.11.0~ynh1" +version = "4.11.1~ynh1" maintainers = ["eric_G"] @@ -45,8 +45,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v4.11.0.tar.gz" - sha256 = "201928cfb149a162af3de454328aa239dbbb38b9fbd46c053ead8fc4c6635de9" + url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v4.11.1.tar.gz" + sha256 = "aaa3420006ee7a22580e449f97ac7c7dfda5a65c33e2803d9ee2ebebcf598330" autoupdate.strategy = "latest_github_tag" [resources.system_user] From e0b0d0cf3d1db8b976adeab96a63b401b313a6ee Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 3 Sep 2023 21:02:53 +0000 Subject: [PATCH 091/112] Auto-update README --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index aa16188..c5051d0 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,6 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in 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. - **Shipped version:** 4.11.1~ynh1 **Demo:** https://lycheeorg.github.io/demo/ From 4b5a56ad76fcdc51373b4d58572072f3a8e6123a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 7 Sep 2023 09:43:57 +0200 Subject: [PATCH 092/112] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 648b7d7..c7b92ef 100644 --- a/manifest.toml +++ b/manifest.toml @@ -61,7 +61,7 @@ ram.runtime = "50M" main.auth_header = false [resources.apt] - packages = "mariadb-server ffmpeg php8.2-xml php8.2-imagick php8.2-bcmath php8.2-exif php8.2-mbstring php8.2-gd php8.2-mysqli php8.2-zip php8.2-intl" + packages = "mariadb-server, ffmpeg, php8.2-xml, php8.2-imagick, php8.2-bcmath, php8.2-exif, php8.2-mbstring, php8.2-gd, php8.2-mysqli, php8.2-zip, php8.2-intl" [resources.database] type = "mysql" From dd1487f0705430888d492689ba8cb5d24c32c4fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 16 Sep 2023 17:44:21 +0200 Subject: [PATCH 093/112] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index c7b92ef..4b04fd8 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.11.1~ynh1" +version = "4.12.0~ynh1" maintainers = ["eric_G"] @@ -45,8 +45,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v4.11.1.tar.gz" - sha256 = "aaa3420006ee7a22580e449f97ac7c7dfda5a65c33e2803d9ee2ebebcf598330" + url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v4.12.0.tar.gz" + sha256 = "adf0eb086a27b70bc0ea71755974458ccb327f263bb092d4d392a2c154843c3c" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 933e6455b7660891b2926e522d33e427a622b29c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 16 Sep 2023 15:44:25 +0000 Subject: [PATCH 094/112] 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 c5051d0..ffd305f 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 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. -**Shipped version:** 4.11.1~ynh1 +**Shipped version:** 4.12.0~ynh1 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index 1071290..f331def 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 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. -**Version incluse :** 4.11.1~ynh1 +**Version incluse :** 4.12.0~ynh1 **Démo :** https://lycheeorg.github.io/demo/ From 5086ab3ea8f45d5d6f71389913a19d3d18ff6a1a Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Sun, 24 Sep 2023 21:54:13 +0200 Subject: [PATCH 095/112] Upgrade to v4.13.0 (#86) * Upgrade to v4.13.0 * Auto-update README --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ffd305f..8ea4184 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 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. -**Shipped version:** 4.12.0~ynh1 +**Shipped version:** 4.13.0~ynh1 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index f331def..caa8158 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 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. -**Version incluse :** 4.12.0~ynh1 +**Version incluse :** 4.13.0~ynh1 **Démo :** https://lycheeorg.github.io/demo/ diff --git a/manifest.toml b/manifest.toml index 4b04fd8..9b5bab4 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.12.0~ynh1" +version = "4.13.0~ynh1" maintainers = ["eric_G"] @@ -45,8 +45,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v4.12.0.tar.gz" - sha256 = "adf0eb086a27b70bc0ea71755974458ccb327f263bb092d4d392a2c154843c3c" + url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v4.13.0.tar.gz" + sha256 = "6587eb628bdd5ac40f70ed78c77f984b6261a1efb62627981ce928c9e4c8386c" autoupdate.strategy = "latest_github_tag" [resources.system_user] From ff8634e1ab6209a6e0a1dc431f286690a3c63243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Nov 2023 10:10:43 +0100 Subject: [PATCH 096/112] no 32bit support --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 9b5bab4..f160c3e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -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 From 0910a360306eabcaa2b124b28dd128ab9a420874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Nov 2023 10:14:27 +0100 Subject: [PATCH 097/112] cleaning --- doc/DESCRIPTION.md | 2 +- doc/DESCRIPTION_fr.md | 1 + scripts/install | 12 ++---------- scripts/upgrade | 9 ++------- 4 files changed, 6 insertions(+), 18 deletions(-) create mode 100644 doc/DESCRIPTION_fr.md 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/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" From f05bca4538a2cd11b469859aa3784b38174d2a56 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 8 Nov 2023 09:14:37 +0000 Subject: [PATCH 098/112] Auto-update README --- README.md | 2 +- README_fr.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3de6695..e8723a2 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ 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 diff --git a/README_fr.md b/README_fr.md index 10a01d9..53e7260 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,7 +16,8 @@ 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 From f61e80b348b748a751fadb54eb122f73f0c777f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Nov 2023 10:15:27 +0100 Subject: [PATCH 099/112] Update manifest.toml --- manifest.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index f160c3e..69d935a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -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" From c38e7f2aa666bc0105e7de60804c96f83e7864c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 25 Dec 2023 16:35:20 +0100 Subject: [PATCH 100/112] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 69d935a..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"] @@ -43,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] From a55f79610f0f704dea1d25e6bf5be97f319047cc Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 25 Dec 2023 15:35:26 +0000 Subject: [PATCH 101/112] 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 e8723a2..bde5354 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 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 53e7260..4c445e2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po 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/ From 6060d671dcb90947cef39ad588a51ff5bec10a8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 27 Dec 2023 23:19:41 +0100 Subject: [PATCH 102/112] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 605929d..8f4c133 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 = "5.0.0~ynh1" +version = "5.0.1~ynh1" maintainers = ["eric_G"] @@ -43,8 +43,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v5.0.0.tar.gz" - sha256 = "fcb37968c63725f0dc9331e88070a568a6d795580bb3a6525ec3edab81672dfc" + url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v5.0.1.tar.gz" + sha256 = "6dfdbfdfbd4e687f24e15ed6c0c8f92f64056d8c8859f052ddfee587b2cae3b5" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 5041e2eba6bfccc2571178f15de1fa4010a41dc1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 27 Dec 2023 22:19:47 +0000 Subject: [PATCH 103/112] 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 bde5354..230c892 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 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:** 5.0.0~ynh1 +**Shipped version:** 5.0.1~ynh1 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index 4c445e2..9c03fc4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po 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 :** 5.0.0~ynh1 +**Version incluse :** 5.0.1~ynh1 **Démo :** https://lycheeorg.github.io/demo/ From a7d8576273a8be42666d2ed99183042170304fa7 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Sat, 30 Dec 2023 09:11:47 +0100 Subject: [PATCH 104/112] Upgrade to v5.0.2 (#91) * Upgrade to v5.0.2 * Auto-update README --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 230c892..423f5e1 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 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:** 5.0.1~ynh1 +**Shipped version:** 5.0.2~ynh1 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index 9c03fc4..9579ba1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po 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 :** 5.0.1~ynh1 +**Version incluse :** 5.0.2~ynh1 **Démo :** https://lycheeorg.github.io/demo/ diff --git a/manifest.toml b/manifest.toml index 8f4c133..42cb616 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 = "5.0.1~ynh1" +version = "5.0.2~ynh1" maintainers = ["eric_G"] @@ -43,8 +43,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v5.0.1.tar.gz" - sha256 = "6dfdbfdfbd4e687f24e15ed6c0c8f92f64056d8c8859f052ddfee587b2cae3b5" + url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v5.0.2.tar.gz" + sha256 = "90c08bbc826eb97f1b6b44ece3ee8e92318752e28e551af9bbb40463193dcd4a" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 967686073f6463a82b0612399731650ad0379add Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 30 Dec 2023 09:12:44 +0100 Subject: [PATCH 105/112] Update manifest.toml --- manifest.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifest.toml b/manifest.toml index 42cb616..6821ece 100644 --- a/manifest.toml +++ b/manifest.toml @@ -20,8 +20,11 @@ code = "https://github.com/LycheeOrg/Lychee" yunohost = ">= 11.2" architectures = ["arm64", "amd64"] multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "50M" ram.runtime = "50M" From 45a6b6231d8f0a35a6c37040c173b6677af26fe5 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 30 Dec 2023 10:52:22 +0100 Subject: [PATCH 106/112] Npm (#93) * fix * fix --- conf/.env.example | 14 +++++++------- manifest.toml | 1 + scripts/_common.sh | 2 ++ scripts/install | 19 +++++++++++++++++++ scripts/remove | 3 +++ scripts/restore | 8 ++++++++ scripts/upgrade | 19 +++++++++++++++++++ 7 files changed, 59 insertions(+), 7 deletions(-) diff --git a/conf/.env.example b/conf/.env.example index 4289340..efe6539 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -75,13 +75,13 @@ REDIS_PASSWORD=null REDIS_PORT=6379 MAIL_DRIVER=smtp -MAIL_HOST= -MAIL_PORT= -MAIL_USERNAME= -MAIL_PASSWORD= -MAIL_ENCRYPTION= -MAIL_FROM_NAME= -MAIL_FROM_ADDRESS= +MAIL_HOST=localhost +MAIL_PORT=25 +MAIL_USERNAME=__APP__ +MAIL_PASSWORD=__MAIL_PWD__ +MAIL_ENCRYPTION=false +MAIL_FROM_NAME=lychee +MAIL_FROM_ADDRESS=lychee@__DOMAIN__ # The trusted proxies if Lychee is behind a reverse proxy # Accepted values: diff --git a/manifest.toml b/manifest.toml index 6821ece..9c9ff56 100644 --- a/manifest.toml +++ b/manifest.toml @@ -51,6 +51,7 @@ ram.runtime = "50M" autoupdate.strategy = "latest_github_tag" [resources.system_user] + allow_email = true [resources.install_dir] diff --git a/scripts/_common.sh b/scripts/_common.sh index 1a7049a..27567b9 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,6 +7,8 @@ # Composer version YNH_COMPOSER_VERSION="2.5.4" +nodejs_version=16 + #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index 5207195..cb20b54 100755 --- a/scripts/install +++ b/scripts/install @@ -19,6 +19,14 @@ fpm_usage="low" timezone="$(cat /etc/timezone)" +#================================================= +# INSTALL DEPENDENCIES +#================================================= +ynh_script_progression --message="Installing dependencies..." --weight=7 + +# Install Nodejs +ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version + #================================================= # STORE SETTINGS FROM MANIFEST #================================================= @@ -69,6 +77,17 @@ ynh_script_progression --message="Installing app with Composer..." --weight=15 ynh_install_composer +#================================================= +# INSTALL LYCHEE +#================================================= +ynh_script_progression --message="Installing $app..." --weight=10 + +pushd $install_dir + ynh_use_nodejs + ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm install + ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH NODE_ENV=production $ynh_npm run build +popd + #================================================= # ADD A CONFIGURATION #================================================= diff --git a/scripts/remove b/scripts/remove index 61db822..04e45b2 100755 --- a/scripts/remove +++ b/scripts/remove @@ -20,6 +20,9 @@ ynh_remove_nginx_config # Remove the dedicated PHP-FPM config ynh_remove_fpm_config +# Remove NodeJS +ynh_remove_nodejs + #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index 869b1ca..6f464d2 100755 --- a/scripts/restore +++ b/scripts/restore @@ -30,6 +30,14 @@ ynh_restore_file --origin_path="$data_dir" --not_mandatory chown -R $app:www-data "$data_dir" +#================================================= +# REINSTALL DEPENDENCIES +#================================================= +ynh_script_progression --message="Reinstalling dependencies..." --weight=7 + +# Install Nodejs +ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version + #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index afe1053..e5bad4e 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -57,6 +57,14 @@ chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" chmod -R 755 $data_dir +#================================================= +# UPGRADE DEPENDENCIES +#================================================= +ynh_script_progression --message="Upgrading dependencies..." --weight=5 + +# Install Nodejs +ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version + #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -87,6 +95,17 @@ ynh_script_progression --message="Installing app with Composer..." --weight=1 ynh_install_composer +#================================================= +# INSTALL LYCHEE +#================================================= +ynh_script_progression --message="Installing $app..." --weight=10 + +pushd $install_dir + ynh_use_nodejs + ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm install + ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH NODE_ENV=production $ynh_npm run build +popd + #================================================= # BUILDING #================================================= From 55b20225d1416296801ae1c4e62bd3f842f03902 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Sat, 13 Jan 2024 08:32:56 +0100 Subject: [PATCH 107/112] Upgrade to v5.0.3 (#96) * Upgrade to v5.0.3 * Auto-update README --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 423f5e1..bf757b6 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 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:** 5.0.2~ynh1 +**Shipped version:** 5.0.3~ynh1 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index 9579ba1..1a215ef 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po 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 :** 5.0.2~ynh1 +**Version incluse :** 5.0.3~ynh1 **Démo :** https://lycheeorg.github.io/demo/ diff --git a/manifest.toml b/manifest.toml index 9c9ff56..734901f 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 = "5.0.2~ynh1" +version = "5.0.3~ynh1" maintainers = ["eric_G"] @@ -46,8 +46,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v5.0.2.tar.gz" - sha256 = "90c08bbc826eb97f1b6b44ece3ee8e92318752e28e551af9bbb40463193dcd4a" + url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v5.0.3.tar.gz" + sha256 = "234e093174a7efa9908ee9a90116e37902ba7c43de3438e05e8954d57f64d108" autoupdate.strategy = "latest_github_tag" [resources.system_user] From e5b6fac53dfdf71480828598f76bf9db19534044 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Thu, 18 Jan 2024 18:44:46 +0100 Subject: [PATCH 108/112] Upgrade to v5.1.0 (#97) * Upgrade to v5.1.0 * Auto-update README --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index bf757b6..85f3096 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 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:** 5.0.3~ynh1 +**Shipped version:** 5.1.0~ynh1 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index 1a215ef..ccb5ae4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po 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 :** 5.0.3~ynh1 +**Version incluse :** 5.1.0~ynh1 **Démo :** https://lycheeorg.github.io/demo/ diff --git a/manifest.toml b/manifest.toml index 734901f..df6005b 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 = "5.0.3~ynh1" +version = "5.1.0~ynh1" maintainers = ["eric_G"] @@ -46,8 +46,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v5.0.3.tar.gz" - sha256 = "234e093174a7efa9908ee9a90116e37902ba7c43de3438e05e8954d57f64d108" + url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v5.1.0.tar.gz" + sha256 = "1eedec1d3e750f138aafdac6caac7ed3cdeeae48276693edb9efebc563a15157" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 4ba220b7e9ac83d39fd4668f7aabceb9aa06e142 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 18 Jan 2024 18:42:03 +0000 Subject: [PATCH 109/112] Auto-update README --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 7b31776..85f3096 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,6 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in 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:** 5.1.0~ynh1 **Demo:** https://lycheeorg.github.io/demo/ From 42737bf4e4400cc00c3cd0d5c84d7e56a7c72025 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 23 Jan 2024 21:33:05 +0100 Subject: [PATCH 110/112] Upgrade to v5.1.1 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index df6005b..36a1536 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 = "5.1.0~ynh1" +version = "5.1.1~ynh1" maintainers = ["eric_G"] @@ -46,8 +46,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v5.1.0.tar.gz" - sha256 = "1eedec1d3e750f138aafdac6caac7ed3cdeeae48276693edb9efebc563a15157" + url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v5.1.1.tar.gz" + sha256 = "9e428ac7e0640f7021c0a3d259e167c75e5cc27be473b09439fccc7b96844608" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 14f0339eb50c7f104972af007548676fe350e011 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 23 Jan 2024 20:33:07 +0000 Subject: [PATCH 111/112] 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 85f3096..9ada807 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 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:** 5.1.0~ynh1 +**Shipped version:** 5.1.1~ynh1 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index ccb5ae4..6ff281f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po 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 :** 5.1.0~ynh1 +**Version incluse :** 5.1.1~ynh1 **Démo :** https://lycheeorg.github.io/demo/ From 23e0c2a98871d298a85a832c75c91f95ef835d8c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 24 Jan 2024 23:18:09 +0000 Subject: [PATCH 112/112] Auto-update README --- README_fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README_fr.md b/README_fr.md index cafd98b..6ff281f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,6 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po 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 :** 5.1.1~ynh1 **Démo :** https://lycheeorg.github.io/demo/