4.8.1

check_process

@@ -1,13 +1,9 @@
-# See here for more information
-# https://github.com/YunoHost/package_check#syntax-check_process-file
-
 ;; Test complet
 	; Manifest
-		domain="domain.tld"	(DOMAIN)
+		domain="domain.tld"
-		path="/path"	    (PATH)
+		path="/path"
 		root_access=0
-        is_public=1	        (PUBLIC|public=1|private=0)
+        is_public=1
-
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1
@@ -18,7 +14,6 @@
 		upgrade=1
 		backup_restore=1
 		multi_instance=1
-		port_already_use=0
 		change_url=1
 ;;; Options
 Email= anmol@datamol.org

manifest.json

@@ -21,7 +21,7 @@
        "url": "https://github.com/jesuisfol/adminer_ynh"
         },
     "requirements": {
-        "yunohost": ">= 4.1.7"
+        "yunohost": ">= 4.2.4"
     },
     "multi_instance": true,
     "services": [

scripts/install

@@ -45,6 +45,14 @@ 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=root_access --value=$root_access
 
+#=================================================
+# CREATE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Configuring system user..." --weight=2
+
+# Create a system user
+ynh_system_user_create --username=$app --home_dir="$final_path"
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -63,23 +71,10 @@ if [[ $root_access -eq 1 ]]; then
 	cp -a ../sources/root_access_disabled/. $final_path
 fi
 
-#=================================================
+chmod 750 "$final_path"
-# CREATE DEDICATED USER
+chmod -R o-rwx "$final_path"
-#=================================================
+chown -R $app:www-data "$final_path"
-ynh_script_progression --message="Configuring system user..." --weight=2
+chmod 755 $final_path/adminer.php
-
-# Create a system user
-ynh_system_user_create --username=$app
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-
-# Set permissions to app files
-chown -R www-data:www-data $final_path
-chmod 755 -R $final_path/adminer.php
 
 #=================================================
 # NGINX CONFIGURATION

scripts/restore

@@ -46,6 +46,14 @@ test ! -d $final_path \
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
+#=================================================
+# RECREATE THE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Recreating the dedicated system user..." --weight=2
+
+# Create the dedicated user (if not existing)
+ynh_system_user_create --username=$app --home_dir="$final_path"
+
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
@@ -53,21 +61,10 @@ ynh_script_progression --message="Restoring Adminer main directory..." --weight=
 
 ynh_restore_file --origin_path="$final_path"
 
-#=================================================
+chmod 750 "$final_path"
-# RECREATE THE DEDICATED USER
+chmod -R o-rwx "$final_path"
-#=================================================
+chown -R $app:www-data "$final_path"
-ynh_script_progression --message="Recreating the dedicated system user..." --weight=2
+chmod 755 $final_path/adminer.php
-
-# Create the dedicated user (if not existing)
-ynh_system_user_create --username=$app
-
-#=================================================
-# STANDARD RESTORATION STEPS
-#=================================================
-
-# Restore permissions to app files
-chown -R www-data:www-data $final_path
-chmod 755 -R $final_path/adminer.php
 
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION

scripts/upgrade

@@ -22,6 +22,26 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 root_access=$(ynh_app_setting_get --app=$app --key=root_access)
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
+#=================================================
+# CHECK VERSION
+#=================================================
+
+upgrade_type=$(ynh_check_app_version_changed)
+
+#=================================================
+# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
+#=================================================
+ynh_script_progression --message="Backing up Adminer before upgrading (may take a while)..." --weight=3
+
+# Backup the current version of the app
+ynh_backup_before_upgrade
+ynh_clean_setup () {
+	# restore it if the upgrade fails
+	ynh_restore_upgradebackup
+}
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
@@ -40,48 +60,38 @@ if ynh_legacy_permissions_exists; then
 	ynh_app_setting_delete --app=$app --key=is_public
 fi
 
-#=================================================
-# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
-#=================================================
-ynh_script_progression --message="Backing up Adminer before upgrading (may take a while)..." --weight=3
-
-# Backup the current version of the app
-ynh_backup_before_upgrade
-ynh_clean_setup () {
-	# restore it if the upgrade fails
-	ynh_restore_upgradebackup
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
 #=================================================
 # 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
+ynh_system_user_create --username=$app --home_dir="$final_path"
 
-# Copy source files
+#=================================================
-ynh_secure_remove $final_path
+# DOWNLOAD, CHECK AND UNPACK SOURCE
+#=================================================
 
-mkdir -p $final_path
+if [ "$upgrade_type" == "UPGRADE_APP" ]
+then
+	# Copy source files
+	ynh_secure_remove $final_path
 
-if [[ $root_access -eq 1 ]]; then
+	mkdir -p $final_path
-#copy files from with_root_access folder to the final_path
+
-	cp -a ../sources/with_root_access/. $final_path
+	if [[ $root_access -eq 1 ]]; then
-	else
+	#copy files from with_root_access folder to the final_path
-	#copy files from root_access_disabled folder to the final_path
+		cp -a ../sources/with_root_access/. $final_path
-	cp -a ../sources/root_access_disabled/. $final_path
+		else
+		#copy files from root_access_disabled folder to the final_path
+		cp -a ../sources/root_access_disabled/. $final_path
+	fi
 fi
 
-#=================================================
+chmod 750 "$final_path"
-# SECURE FILES AND DIRECTORIES
+chmod -R o-rwx "$final_path"
-#=================================================
+chown -R $app:www-data "$final_path"
-
+chmod 755 $final_path/adminer.php
-# Set permissions to app files
-chmod 755 -R $final_path/adminer.php
-chown -R www-data:www-data $final_path
 
 #=================================================
 # NGINX CONFIGURATION