From 5847413636932c3e0eb2e187e599043aba1f8a7c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 7 Nov 2020 10:29:37 +0100 Subject: [PATCH 1/8] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index b84e090..397e83b 100644 --- a/check_process +++ b/check_process @@ -19,7 +19,7 @@ backup_restore=1 multi_instance=1 port_already_use=0 - change_url=0 + change_url=1 ;;; Levels # If the level 5 (Package linter) is forced to 1. Please add justifications here. Level 5=auto From a24e803c93baa84fd849dc00883f6aa2ff422c3f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 13 Nov 2020 22:42:22 +0100 Subject: [PATCH 2/8] Update nginx.conf --- conf/nginx.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index fa6bad6..9e7a3ef 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -11,7 +11,8 @@ location ^~ __PATH__/ { index index.php; - try_files $uri $uri/ @lychee; + try_files $uri $uri/ /lychee//lychee/index.php?$query_string; + location ~ \.php$ { if (!-e $request_filename) { rewrite ^/lychee/?(.*)$ /lychee/index.php?/$1 last; From b0e6ccab6b6b1bf9512906487c7fa90aa9ce6b87 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 13 Nov 2020 23:07:17 +0100 Subject: [PATCH 3/8] Update nginx.conf --- conf/nginx.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 9e7a3ef..2a116c6 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -11,11 +11,11 @@ location ^~ __PATH__/ { index index.php; - try_files $uri $uri/ /lychee//lychee/index.php?$query_string; + try_files $uri $uri/ __PATH__/__PATH__/index.php?$query_string; location ~ \.php$ { if (!-e $request_filename) { - rewrite ^/lychee/?(.*)$ /lychee/index.php?/$1 last; + rewrite ^__PATH__/?(.*)$ __PATH__/index.php?/$1 last; break; } fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; @@ -31,5 +31,5 @@ location ^~ __PATH__/ { include conf.d/yunohost_panel.conf.inc; } location @lychee { - rewrite /lychee/(.*)$ /lychee/index.php?/$1 last; + rewrite __PATH__/(.*)$ __PATH__/index.php?/$1 last; } From e1fc69b89381c5720636c194dacfea22d0cda582 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 14 Nov 2020 09:33:32 +0100 Subject: [PATCH 4/8] Remove unneeded phpversion --- scripts/_common.sh | 2 -- scripts/install | 2 +- scripts/upgrade | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 62b5714..7b7f25e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -116,5 +116,3 @@ ynh_multimedia_addfolder () { ./yunohost.multimedia-master/script/ynh_media_addfolder.sh --source="$source_dir" --dest="$dest_dir" } - - diff --git a/scripts/install b/scripts/install index 5e5e931..33d3013 100755 --- a/scripts/install +++ b/scripts/install @@ -93,7 +93,7 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" +ynh_add_fpm_config --package="$extra_php_dependencies" phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 75e49fa..53e31ec 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -110,7 +110,7 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Upgrading PHP-FPM configuration..." # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" +ynh_add_fpm_config --package="$extra_php_dependencies" #================================================= # SPECIFIC UPGRADE From bbbd06722c3d84374f23f025e1288f49d6d6ed5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 15 Nov 2020 23:07:40 +0100 Subject: [PATCH 5/8] Testing (#2) * Allow large files (< 512MB) to be uploaded --- conf/nginx.conf | 5 +++++ conf/php-fpm.conf | 4 ++-- manifest.json | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 2a116c6..703a88c 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -11,6 +11,10 @@ location ^~ __PATH__/ { index index.php; + # setup for image upload + client_max_body_size 512M; + proxy_max_temp_file_size2048M; + try_files $uri $uri/ __PATH__/__PATH__/index.php?$query_string; location ~ \.php$ { @@ -30,6 +34,7 @@ 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 43fca0c..c1a6f44 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] = 200M -php_admin_value[post_max_size] = 200M +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 diff --git a/manifest.json b/manifest.json index 782fe01..99ab516 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.0.7~ynh1", + "version": "4.0.7~ynh2", "url": "https://lycheeorg.github.io/", "license": "MIT", "maintainer": { From 2eaadb4493d0aeec6c025d3911374ef86b6b18a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 15 Nov 2020 23:15:31 +0100 Subject: [PATCH 6/8] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 703a88c..6922a0c 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -13,7 +13,7 @@ location ^~ __PATH__/ { # setup for image upload client_max_body_size 512M; - proxy_max_temp_file_size2048M; + proxy_max_temp_file_size 2048M; try_files $uri $uri/ __PATH__/__PATH__/index.php?$query_string; From 9ef3c484f14dcabc572da1b22ad70e720c3f3f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 18 Nov 2020 14:33:14 +0100 Subject: [PATCH 7/8] Testing (#3) - Fix NGINX settings --- conf/nginx.conf | 1 - manifest.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 6922a0c..49eb90b 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -13,7 +13,6 @@ location ^~ __PATH__/ { # setup for image upload client_max_body_size 512M; - proxy_max_temp_file_size 2048M; try_files $uri $uri/ __PATH__/__PATH__/index.php?$query_string; diff --git a/manifest.json b/manifest.json index 99ab516..e2f72af 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.0.7~ynh2", + "version": "4.0.7~ynh3", "url": "https://lycheeorg.github.io/", "license": "MIT", "maintainer": { From 57aea11641e6da63d2b29f70b86d6dae4d5bb906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 20 Nov 2020 08:47:40 +0100 Subject: [PATCH 8/8] Testing (#4) - Upgrade to version 4.0.8 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/upgrade | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 6954479..49e16d4 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,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. -**Shipped version:** 4.0.7 +**Shipped version:** 4.0.8 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 8315882..409011c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble Lychee est un outil de gestion de photos gratuit, qui fonctionne sur votre serveur ou votre espace Web. L'installation est une question de secondes. 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.0.7 +**Version incluse :** 4.0.8 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index db225fc..265cd0f 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/LycheeOrg/Lychee/releases/download/v4.0.7/Lychee.zip -SOURCE_SUM=cebf61ccac3c9bbf081fefa7dfb287f2ef74f09bbda5ee530ae1e4b1c13d28d7 +SOURCE_URL=https://github.com/LycheeOrg/Lychee/releases/download/v4.0.8/Lychee.zip +SOURCE_SUM=107aea88ea20c6cff7e3279354819ecfeffef780197d2d86229d088082cfbf5d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index e2f72af..0ab3064 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.0.7~ynh3", + "version": "4.0.8~ynh1", "url": "https://lycheeorg.github.io/", "license": "MIT", "maintainer": { diff --git a/scripts/upgrade b/scripts/upgrade index 53e31ec..501878e 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -124,9 +124,9 @@ ynh_install_composer ynh_exec_warn_less ynh_composer_exec --commands=\"dump-autoload\" -( cd $final_path && php$YNH_PHP_VERSION artisan migrate -n --force) -( cd $final_path && php$YNH_PHP_VERSION artisan config:clear -n ) -( cd $final_path && php$YNH_PHP_VERSION artisan config:cache -n ) +( cd $final_path && php$phpversion artisan migrate -n --force ) +( cd $final_path && php$phpversion artisan config:clear -n ) +( cd $final_path && php$phpversion artisan config:cache -n ) ynh_backup_if_checksum_is_different --file="$final_path/.env" # Recalculate and store the checksum of the file for the next upgrade.