diff --git a/pull_request.md b/pull_request.md index 6a22559..7617707 100644 --- a/pull_request.md +++ b/pull_request.md @@ -5,8 +5,10 @@ - *easier yunohost integration* ## PR Status -- [ ] Code finished. -- [ ] Tested with Package_check. -- [ ] Fix or enhancement tested. -- [ ] Upgrade from last version tested. -- [ ] Can be reviewed and tested. +- [X] Code finished. +- [X] Tested with Package_check. +- [X] Fix or enhancement tested. +- [X] Upgrade from last version tested. +- [X] Can be reviewed and tested. +- [X] Upgrade php version +- [X] Update dependancies diff --git a/scripts/backup b/scripts/backup index 1c6ebf4..35d1b03 100755 --- a/scripts/backup +++ b/scripts/backup @@ -36,18 +36,21 @@ ynh_print_info --message="Declaring files to be backed up..." #================================================= # BACKUP THE APP MAIN DIR #================================================= +ynh_print_info --message="Backing up the main app directory..." ynh_backup --src_path="$final_path" #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= +ynh_print_info --message="Backing up nginx web server configuration..." ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # BACKUP THE PHP-FPM CONFIGURATION #================================================= +ynh_print_info --message="Backing up php-fpm configuration..." ynh_backup --src_path="/etc/php/$YNH_PHP_VERSION/fpm/pool.d/$app.conf" @@ -56,7 +59,7 @@ ynh_backup --src_path="/etc/php/$YNH_PHP_VERSION/fpm/pool.d/$app.conf" #================================================= # BACKUP LOGROTATE #================================================= -ynh_script_progression --message="Backing up logrotate configuration..." --weight=1 +ynh_print_info --message="Backing up logrotate configuration..." ynh_backup --src_path="/etc/logrotate.d/$app" diff --git a/scripts/install b/scripts/install index d2b8aaf..5558e7a 100644 --- a/scripts/install +++ b/scripts/install @@ -97,7 +97,7 @@ ynh_system_user_create --username=$app #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring php-fpm..." --weight=2 +ynh_script_progression --message="Configuring php-fpm and install dependencies..." --weight=2 # Create a dedicated php-fpm config ynh_add_fpm_config --usage=medium --footprint=medium --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" diff --git a/scripts/restore b/scripts/restore index 0563314..368ff0b 100755 --- a/scripts/restore +++ b/scripts/restore @@ -77,7 +77,7 @@ chown -R root: $final_path #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=50 +ynh_print_info --message="Reconfiguring PHP-FPM..." ynh_restore_file --origin_path="/etc/php/$YNH_PHP_VERSION/fpm/pool.d/$app.conf"