From f7730d904b9e588d053edbcb9fa1ab6f2af82434 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 20:36:41 +0100 Subject: [PATCH] Testing (#64) * #39 * Update upgrade * Update manifest.json * Auto-update README * Update _common.sh * Update _common.sh * Cleaning up * Fix * Create DESCRIPTION.md * Auto-update README * Create updater.sh * Update updater.sh * Create updater.yml (#42) * Update upgrade * Update upgrade * Auto-update README * Update upgrade * Update upgrade * Apply example_ynh (#43) * Auto-update README * Apply example_ynh * Auto-update README * fix missing datadir * Fix missing phpversion * Update upgrade * Update check_process Co-authored-by: yunohost-bot * Auto-update README * 4.7.0 (#50) * 4.6.2 * Auto-update README * 4.7.0 * Auto-update README * Fix PHP * Update upgrade * Update restore * Update install * Update install * Update PHP to 8.1 * Update upgrade * Update install * Fix * Update ffprobe.patch * Update install * Update install * Update upgrade Co-authored-by: yunohost-bot * Upgrade auto-updater (#58) * [autopatch] Upgrade auto-updater * Auto-update README --------- Co-authored-by: tituspijean * Update .env.example * Version 2 (#61) * v2 * fix * v2 * Update manifest.toml * Auto-update README * Fix * Auto-update README * 4.7.2 * Auto-update README * Update install * Update manifest.toml * Update _common.sh * Update install * Update install * Update .env.example * Update install * Update install * Update install * Update install * Update install * Update install * Update install * Update install * Fix * Update install * Update install * Update .env.example * Update install * Update install * Update install * Update manifest.toml * Auto-update README --------- Co-authored-by: yunohost-bot Co-authored-by: yalh76 Co-authored-by: YunoHost Bot Co-authored-by: tituspijean --- README.md | 2 +- README_fr.md | 2 +- conf/.env.example | 52 +++++++++++++++++++++++++++++++++++------------ conf/nginx.conf | 2 +- manifest.toml | 2 +- scripts/install | 6 ++---- 6 files changed, 45 insertions(+), 21 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/ diff --git a/conf/.env.example b/conf/.env.example index 4265b91..4289340 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/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"] diff --git a/scripts/install b/scripts/install index 7da6032..aea2ea2 100755 --- a/scripts/install +++ b/scripts/install @@ -66,10 +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 775 "$data_dir/uploads/" -chmod 2775 "$data_dir/uploads/import/" -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/ #================================================= # INSTALL APP WITH COMPOSER