Reorder

check_process

@@ -14,7 +14,6 @@
 		upgrade=1	from_commit=73f74039fb63adc555222d73ded6b43a64d41456
 		backup_restore=1
 		multi_instance=0
-		port_already_use=0
 		change_url=1
 ;;; Upgrade options
 	; commit=73f74039fb63adc555222d73ded6b43a64d41456

manifest.json

@@ -6,7 +6,7 @@
         "en": "Modern HTTP web server index for NGINX.",
         "fr": "Serveur moderne d'index pour NGINX."
     },
-    "version": "0.30.0~ynh1",
+    "version": "0.30.0~ynh2",
     "url": "https://larsjung.de/h5ai/",
     "upstream": {
         "license": "MIT",

scripts/install

@@ -45,20 +45,27 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 test ! -e "$final_path" || ynh_die "This path already contains a folder"
 
 #=================================================
-# STORE SETTINGS FROM MANIFEST
+# CREATE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Storing installation settings..." --weight=1
+ynh_script_progression --message="Configuring system user..." --weight=1
 
-ynh_app_setting_set --app=$app --key=final_path --value=$final_path
+# Create a system user
+ynh_system_user_create --username=$app --home_dir="$final_path"
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 ynh_script_progression --message="Setting up source files..." --weight=4
 
+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 "$final_path"
 
+# Restore permissions on app files
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -67,25 +74,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=1
 # Create a dedicated nginx config
 ynh_add_nginx_config
 
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Configuring system user..." --weight=1
-
-# Create a system user
-ynh_system_user_create --username=$app
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-
-# Restore permissions on app files
-chmod 750 "$final_path"
-chmod -R o-rwx "$final_path"
-chown -R $app:www-data "$final_path"
-
 #=================================================
 # SETUP SSOWAT
 #=================================================

scripts/remove

@@ -26,6 +26,13 @@ ynh_script_progression --message="Removing $app main directory..." --weight=3
 # Remove sources
 ynh_secure_remove --file="$final_path"
 
+#=================================================
+# REMOVE THE NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
+
+ynh_remove_nginx_config
+
 #=================================================
 # REMOVE DEDICATED USER
 #=================================================
@@ -34,13 +41,6 @@ ynh_script_progression --message="Removing the dedicated system user..." --weigh
 # Delete a system user
 ynh_system_user_delete --username=$app
 
-#=================================================
-# REMOVE THE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
-
-ynh_remove_nginx_config
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/restore

@@ -44,24 +44,20 @@ test ! -d $final_path \
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# RESTORE THE APP MAIN DIR
-#=================================================
-ynh_script_progression --message="Restoring the app main directory..." --weight=4
-
-ynh_restore_file --origin_path="$final_path"
-
 #=================================================
 # 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
+ynh_system_user_create --username=$app --home_dir="$final_path"
 
 #=================================================
-# RESTORE USER RIGHTS
+# RESTORE THE APP MAIN DIR
 #=================================================
+ynh_script_progression --message="Restoring the app main directory..." --weight=4
+
+ynh_restore_file --origin_path="$final_path"
 
 # Restore permissions on app files
 chmod 750 "$final_path"

scripts/upgrade

@@ -49,6 +49,13 @@ if ynh_legacy_permissions_exists; then
 
 	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"
 
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
@@ -76,6 +83,11 @@ then
 	ynh_setup_source --dest_dir="$final_path"
 fi
 
+# Set permissions on app files
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -84,25 +96,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# 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
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-
-# Set permissions on app files
-chmod 750 "$final_path"
-chmod -R o-rwx "$final_path"
-chown -R $app:www-data "$final_path"
-
 #=================================================
 # RELOAD NGINX
 #=================================================