From 382238568e6ae809a203aadf027cbdf5d8a20ed3 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 3 Dec 2021 22:22:18 +0100
Subject: [PATCH] 4.4

---
 conf/app.src       |  4 ++--
 conf/nginx.conf    |  5 -----
 manifest.json      |  4 ++--
 scripts/_common.sh |  2 +-
 scripts/install    |  4 ++--
 scripts/upgrade    | 12 ++----------
 6 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index 920bcbe..2ba7af7 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/LycheeOrg/Lychee/releases/download/v4.3.6/Lychee.zip
-SOURCE_SUM=e93f866f0cc6be2add4b92e424eab1a3e62a261c9ec6a4ef52d2af78362ea4f4
+SOURCE_URL=https://github.com/LycheeOrg/Lychee/releases/download/v4.4.0/Lychee.zip
+SOURCE_SUM=2d451033e392e6c3287f8962524e9b4f5581d8e3dfcc9040690d2dc190274c26
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 508f7a4..fdcc175 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -4,11 +4,6 @@ location ^~ __PATH__/ {
   # Path to source
   alias __FINALPATH__/public/ ;
 
-  # Force usage of https
-  if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-  }
-
   index index.php;
 
   # setup for image upload
diff --git a/manifest.json b/manifest.json
index 7470010..98657b4 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.3.6~ynh1",
+    "version": "4.4~ynh1",
     "url": "https://lycheeorg.github.io/",
     "upstream": {
         "license": "MIT",
@@ -26,7 +26,7 @@
     "multi_instance": true,
     "services": [
         "nginx",
-        "php7.3-fpm",
+        "php8.0-fpm",
         "mysql"
     ],
     "arguments": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index a6f73f7..cb4f793 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION="7.4"
+YNH_PHP_VERSION="8.0"
 
 # Composer version
 YNH_COMPOSER_VERSION="2.1.3"
diff --git a/scripts/install b/scripts/install
index a273eb4..d1c4688 100755
--- a/scripts/install
+++ b/scripts/install
@@ -44,6 +44,7 @@ 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
@@ -113,8 +114,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low
-phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
+ynh_add_fpm_config
 
 #=================================================
 # INSTALL LYCHEE WITH COMPOSER
diff --git a/scripts/upgrade b/scripts/upgrade
index adfbf34..ea74839 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -86,14 +86,6 @@ ynh_script_progression --message="Making sure dedicated system user exists..." -
 # Create a dedicated user (if not existing)
 ynh_system_user_create --username=$app --home_dir="$final_path"
 
-#=================================================
-# 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
 #=================================================
@@ -132,7 +124,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 --usage=low --footprint=low
+ynh_add_fpm_config
 
 #=================================================
 # PHP-FPM CONFIGURATION
@@ -161,7 +153,7 @@ ynh_replace_string --match_string="\$ffmpeg = FFMpeg::create();" --replace_strin
 #=================================================
 ynh_script_progression --message="Upgrading $app source files..." --weight=4
 
-ynh_exec_warn_less ynh_composer_exec --commands=dump-autoload
+ynh_exec_warn_less ynh_composer_exec --commands="dump-autoload"
 
 pushd $final_path
 	#php$phpversion artisan key:generate