From fcaa277cb7bd68ea4264f3b6410cc50bcda5b147 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Mon, 5 Sep 2022 03:06:57 +0200
Subject: [PATCH] Apply example_ynh

---
 check_process             |   3 ---
 conf/nginx.conf           |   2 +-
 doc/.DS_Store             | Bin 6148 -> 0 bytes
 doc/screenshots/.DS_Store | Bin 6148 -> 0 bytes
 scripts/install           |  18 ++++++++++--------
 scripts/remove            |   2 +-
 scripts/restore           |  22 +++++++++++-----------
 scripts/upgrade           |  29 ++++++++++++++++++-----------
 8 files changed, 41 insertions(+), 35 deletions(-)
 delete mode 100644 doc/.DS_Store
 delete mode 100644 doc/screenshots/.DS_Store

diff --git a/check_process b/check_process
index c3b3e73..1636a1e 100644
--- a/check_process
+++ b/check_process
@@ -1,10 +1,7 @@
 ;; Test complet
 	; Manifest
 		domain="domain.tld"
-		path="/path"
-		admin="john"
 		is_public=1
-		password="1Strong-Password"
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=0
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 255752b..d86f108 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,4 +1,4 @@
-location / {
+location __PATH__/ {
 
   # Path to source
   alias __FINALPATH__/web/;
diff --git a/doc/.DS_Store b/doc/.DS_Store
deleted file mode 100644
index c90376b56b73b627c519d1a34c5d8c9abb7004dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKyG{c^3>-s>NNG}1?l15Mt0;UyegFv&DbPhqfch%Fi%(<x5F)yyNRbAOC3|+g
zo;}?Z=Q99XeLUX-O8|4aBfdOL&ClH@c2gN6(s{=V1{|=(4)2rd(+TG;$a%t^?7#fO
z=Vm{=?S|L9{WM)!DIf);fE17dQs6=by!X=Pi$p~!AO)nruLAykXmrP3I3~uYgCRx$
z;*9Aqu49%UHct?H;h4w_&5}w?s?~^LNoT%QT`wFHlMbul!|KUa6N<&td4G#?SWi@x
z0#e{uf!o|Jz5hSZ&&>bFB<-Yt6!=#P*lfL7ulP#UTPH8)y|&RG>0a|qcjG!J4AG8>
j(T=(Cc6=8_S=W5c^IkY62A%n!6ZJFTy2zx!wH5dQ#>Eyj

diff --git a/doc/screenshots/.DS_Store b/doc/screenshots/.DS_Store
deleted file mode 100644
index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

diff --git a/scripts/install b/scripts/install
index c0cfec0..a6acc30 100755
--- a/scripts/install
+++ b/scripts/install
@@ -76,14 +76,6 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=1
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
@@ -92,6 +84,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config
 
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Configuring NGINX web server..." --weight=1
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
 #=================================================
 # SPECIFIC SETUP
 #=================================================
@@ -140,6 +140,8 @@ 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
 
diff --git a/scripts/remove b/scripts/remove
index 13b0c7c..dfcbda5 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -64,7 +64,7 @@ ynh_remove_app_dependencies
 #=================================================
 # REMOVE VARIOUS FILES
 #=================================================
-ynh_script_progression --message="Removing various files..."
+ynh_script_progression --message="Removing various files..." --weight=1
 
 # Remove the log files
 ynh_secure_remove --file="/var/log/$app"
diff --git a/scripts/restore b/scripts/restore
index 9e3de02..8cb6d80 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -42,13 +42,6 @@ test ! -d $final_path \
 
 #=================================================
 # STANDARD RESTORATION STEPS
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
 #=================================================
 # RECREATE THE DEDICATED USER
 #=================================================
@@ -68,6 +61,14 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
+#=================================================
+# REINSTALL DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Reinstalling dependencies..." --weight=1
+
+# Define and install dependencies
+ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
@@ -76,12 +77,11 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
 #=================================================
-# REINSTALL DEPENDENCIES
+# RESTORE THE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Reinstalling dependencies..." --weight=1
+ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
 
-# Define and install dependencies
-ynh_install_app_dependencies $pkg_dependencies
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
 # RESTORE THE LOGROTATE CONFIGURATION
diff --git a/scripts/upgrade b/scripts/upgrade
index e2a5b67..ee723c3 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -23,7 +23,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 #=================================================
 # CHECK VERSION
 #=================================================
-ynh_script_progression --message="Checking version..."
+ynh_script_progression --message="Checking version..." --weight=1
 
 upgrade_type=$(ynh_check_app_version_changed)
 
@@ -62,20 +62,10 @@ then
 	ynh_setup_source --dest_dir="$final_path"
 fi
 
-ynh_install_composer --install_args="--ignore-platform-reqs" 2>&1
-
 chmod 750 "$final_path"
 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=1
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
@@ -91,6 +81,23 @@ 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=1
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
+#=================================================
+# SPECIFIC UPGRADE
+#=================================================
+# INSTALL LYCHEE WITH COMPOSER
+#=================================================
+ynh_script_progression --message="Installing $app with Composer..." --weight=5
+
+ynh_install_composer --install_args="--ignore-platform-reqs" 2>&1
+
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================