diff --git a/check_process b/check_process index daac097..4aadc90 100644 --- a/check_process +++ b/check_process @@ -15,6 +15,7 @@ setup_private=1 setup_public=1 upgrade=1 + upgrade=1 from_commit=14e4f25a068e95cbb75990733b8dcc9ed2edf59c backup_restore=1 multi_instance=1 change_url=1 @@ -22,6 +23,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=CommitHash - name=Name and date of the commit. + ; commit=14e4f25a068e95cbb75990733b8dcc9ed2edf59c + name=Testing (#9) manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& diff --git a/scripts/change_url b/scripts/change_url index 8fd83e9..07d5819 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -102,4 +102,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Change of URL completed for $app" --last +ynh_script_progression --message="Change of URL completed for $app" diff --git a/scripts/install b/scripts/install index bdadbdd..90c8106 100644 --- a/scripts/install +++ b/scripts/install @@ -88,7 +88,7 @@ ynh_script_progression --message="Securing files and directories..." # Set permissions to app files chown -R $app:www-data $final_path -chmod -R 775 $final_path +chmod 775 $final_path #================================================= # SETUP SSOWAT @@ -112,4 +112,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of $app completed" --last +ynh_script_progression --message="Installation of $app completed" diff --git a/scripts/remove b/scripts/remove index 1372957..ff0282f 100644 --- a/scripts/remove +++ b/scripts/remove @@ -57,4 +57,4 @@ ynh_system_user_delete --username=$app # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of $app completed" --last +ynh_script_progression --message="Removal of $app completed" diff --git a/scripts/restore b/scripts/restore index 0933759..5fd497d 100755 --- a/scripts/restore +++ b/scripts/restore @@ -49,10 +49,10 @@ 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=1 +ynh_script_progression --message="Recreating the dedicated system user..." # Create the dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" +ynh_system_user_create --username=$app #================================================= # RESTORE THE APP MAIN DIR @@ -68,8 +68,7 @@ ynh_script_progression --message="Restoring user rights..." # Restore permissions on app files chown -R $app:www-data $final_path -chmod -R o-rwx $final_path -chmod -R 775 $final_path +chmod 775 $final_path #================================================= # RESTORE THE PHP-FPM CONFIGURATION @@ -92,4 +91,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for $app" --last +ynh_script_progression --message="Restoration completed for $app" diff --git a/scripts/upgrade b/scripts/upgrade index d9efbb8..d7fd836 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -113,7 +113,7 @@ ynh_script_progression --message="Securing files and directories..." # Set permissions on app files chown -R $app:www-data $final_path -chmod -R 775 $final_path +chmod 775 $final_path #================================================= # RELOAD NGINX @@ -126,4 +126,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of $app completed" --last +ynh_script_progression --message="Upgrade of $app completed"