From 4c401fae039953f6c31675f2df0153068b2f9b5e Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 24 Mar 2020 15:10:51 +0100 Subject: [PATCH] Backup/restore --- scripts/backup | 48 ++++++++++++++++------------ scripts/restore | 84 +++++++++++++++++++++++++++---------------------- 2 files changed, 75 insertions(+), 57 deletions(-) diff --git a/scripts/backup b/scripts/backup index f501e0e..2ba7e4a 100644 --- a/scripts/backup +++ b/scripts/backup @@ -6,65 +6,73 @@ # IMPORT GENERIC HELPERS #================================================= -source _common.sh -source psql.sh +source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers +source ../settings/scripts/ynh_add_extra_apt_repos +source ../settings/scripts/ynh_install_php #================================================= # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= +ynh_script_progression --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME -final_path=$(ynh_app_setting_get "$app" final_path) -domain=$(ynh_app_setting_get "$app" domain) -db_name=$(ynh_app_setting_get "$app" psql_db) +final_path=$(ynh_app_setting_get --app=$app --key=final_path) +data_root=$(ynh_app_setting_get --app=$app --key=data_root) +domain=$(ynh_app_setting_get --app=$app --key=domain) +db_name=$(ynh_app_setting_get --app=$app --key=db_name) #================================================= # STANDARD BACKUP STEPS #================================================= # BACKUP THE APP MAIN DIR #================================================= +ynh_script_progression --message="Backing up the main app directory..." -ynh_backup "$final_path" -# BACKUP APP home directory -ynh_backup "/home/yunohost.app/$app" +ynh_backup --src_path="$final_path" + +ynh_backup --src_path="$data_root" #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= +ynh_script_progression --message="Backing up nginx web server configuration..." -ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # BACKUP THE PHP-FPM CONFIGURATION #================================================= +ynh_script_progression --message="Backing up php-fpm configuration..." -ynh_backup "/etc/php5/fpm/pool.d/$app.conf" -ynh_backup "/etc/php5/fpm/conf.d/20-$app.ini" +ynh_backup --src_path="/etc/php/$YNH_PHP_VERSION/fpm/pool.d/$app.conf" #================================================= -# BACKUP THE PSQL DATABASE +# BACKUP THE MYSQL DATABASE #================================================= +ynh_script_progression --message="Backing up the PostgreSQL database..." -ynh_psql_dump_db "$db_name" > db.sql -ynh_backup "db.sql" +ynh_psql_dump_db --database="$db_name" > db.sql #================================================= # SPECIFIC BACKUP #================================================= -# BACKUP THE CRON FILE +# BACKUP A CRON FILE +#================================================= +ynh_script_progression --message="Backing up the cron file..." + +ynh_backup --src_path="/etc/cron.d/$app" + +#================================================= +# END OF SCRIPT #================================================= -ynh_backup "/etc/cron.d/$app" +ynh_script_progression --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." --last diff --git a/scripts/restore b/scripts/restore index ff17c15..4b6d3c9 100644 --- a/scripts/restore +++ b/scripts/restore @@ -5,41 +5,43 @@ #================================================= # IMPORT GENERIC HELPERS #================================================= -source _common.sh -source psql.sh + +source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers +source ../settings/scripts/ynh_add_extra_apt_repos +source ../settings/scripts/ynh_install_php #================================================= # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - #### Remove this function if there's nothing to clean before calling the remove script. - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= +ynh_script_progression --message="Loading settings..." app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get $app domain) -path_url=$(ynh_app_setting_get $app path) -final_path=$(ynh_app_setting_get $app final_path) -db_name=$(ynh_app_setting_get $app psql_db) -db_pwd=$(ynh_app_setting_get $app psqlpwd) +domain=$(ynh_app_setting_get --app=$app --key=domain) +path_url=$(ynh_app_setting_get --app=$app --key=path) +final_path=$(ynh_app_setting_get --app=$app --key=final_path) +data_root=$(ynh_app_setting_get --app=$app --key=data_root) +db_name=$(ynh_app_setting_get --app=$app --key=db_name) #================================================= # CHECK IF THE APP CAN BE RESTORED #================================================= +ynh_script_progression --message="Validating restoration parameters..." -ynh_webpath_available $domain $path_url \ - || ynh_die "Path not available: ${domain}${path_url}" +ynh_webpath_available --domain=$domain --path_url=$path_url \ + || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ - || ynh_die "There is already a directory: $final_path " + || ynh_die --message="There is already a directory: $final_path " +test ! -d $data_root \ + || ynh_die --message="There is already a directory: $data_root " #================================================= # STANDARD RESTORATION STEPS @@ -47,30 +49,24 @@ test ! -d $final_path \ # RESTORE THE NGINX CONFIGURATION #================================================= -ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # RESTORE THE APP MAIN DIR #================================================= -var_root=/home/yunohost.app/$app -ynh_restore_file "$final_path" -ynh_restore_file "$var_root" +ynh_script_progression --message="Restoring the app main directory..." -#================================================= -# RESTORE THE psql DATABASE -#================================================= -ynh_psql_test_if_first_run -ynh_psql_create_user $app $db_pwd -ynh_psql_execute_as_root \ -"CREATE DATABASE $db_name ENCODING 'UTF8' LC_COLLATE='C' LC_CTYPE='C' template=template0 OWNER $app;" -ynh_psql_execute_file_as_root ./db.sql "$db_name" +ynh_restore_file --origin_path="$final_path" + +ynh_restore_file --origin_path="$data_root" #================================================= # RECREATE THE DEDICATED USER #================================================= +ynh_script_progression --message="Recreating the dedicated system user..." # Create the dedicated user (if not existing) -ynh_system_user_create $app +ynh_system_user_create --username=$app #================================================= # RESTORE USER RIGHTS @@ -78,38 +74,52 @@ ynh_system_user_create $app # Restore permissions on app files chown -R $app: $final_path -chown -R root: $final_path/config.php -mkdir -p $var_root -chown -R $app: $var_root -chmod -R 700 $var_root +chown -R $app: $data_root #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_restore_file "/etc/php5/fpm/pool.d/$app.conf" -ynh_restore_file "/etc/php5/fpm/conf.d/20-$app.ini" +ynh_restore_file --origin_path="/etc/php/$YNH_PHP_VERSION/fpm/pool.d/$app.conf" #================================================= # SPECIFIC RESTORATION #================================================= # REINSTALL DEPENDENCIES #================================================= +ynh_script_progression --message="Reinstalling dependencies..." --weight=60 # Define and install dependencies -ynh_install_app_dependencies php-zip php-mysql php-xml php-intl php-mbstring php-gd php-curl php-soap php-pgsql php-xmlrpc postgresql +ynh_install_app_dependencies $pkg_dependencies +ynh_install_php --phpversion="$YNH_PHP_VERSION" --package="$extra_pkg_dependencies" + +#================================================= +# RESTORE THE MYSQL DATABASE +#================================================= +ynh_script_progression --message="Restoring the PostgreSQL database..."--weight=47 + +db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) +ynh_psql_setup_db --db_user=$db_name --db_name=$db_name --db_pwd=$db_pwd +ynh_psql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ./db.sql #================================================= # RESTORE THE CRON FILE #================================================= -ynh_restore_file "/etc/cron.d/$app" +ynh_restore_file --origin_path="/etc/cron.d/$app" #================================================= # GENERIC FINALIZATION #================================================= # RELOAD NGINX AND PHP-FPM #================================================= +ynh_script_progression --message="Reloading nginx web server and php-fpm..." -systemctl reload php5-fpm -systemctl reload nginx +ynh_systemd_action --service_name=php$YNH_PHP_VERSION-fpm --action=reload +ynh_systemd_action --service_name=nginx --action=reload + +#================================================= +# END OF SCRIPT +#================================================= + +ynh_script_progression --message="Restoration completed for $app" --last