update backup and restore scripts

scripts/backup

@@ -1,23 +1,57 @@
 #!/bin/bash
-# DotClear 2 backup script for YunoHost
 
-app=dotclear2
+#=================================================
+# GENERIC START
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
 
-# The parameter $1 is the backup directory location
+source ../settings/scripts/_common.sh
-# which will be compressed afterward
+source /usr/share/yunohost/helpers
-backup_dir=$1/apps/$app
-sudo mkdir -p $backup_dir
-sudo chown admin $backup_dir
 
-# Backup sources
+#=================================================
-sudo cp -a /var/www/$app/. $backup_dir/sources
+# MANAGE SCRIPT FAILURE
+#=================================================
 
-# Backup database
+ynh_clean_setup () {
-db_password=$(sudo yunohost app setting $app db_password)
+	### Remove this function if there's nothing to clean before calling the remove script.
-sudo mysqldump -u $app -p"$db_password" $app > $backup_dir/dump.sql
+	true
+}
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
 
-# Copy Nginx and YunoHost parameters to make the script "standalone"
+#=================================================
-sudo cp -a /etc/yunohost/apps/$app/. $backup_dir/yunohost
+# LOAD SETTINGS
-domain=$(sudo yunohost app setting $app domain)
+#=================================================
-sudo cp -a /etc/nginx/conf.d/$domain.d/$app.conf $backup_dir/nginx.conf
 
+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 db_name)
+
+#=================================================
+# STANDARD BACKUP STEPS
+#=================================================
+# BACKUP THE APP MAIN DIR
+#=================================================
+
+ynh_backup "$final_path"
+
+#=================================================
+# BACKUP THE NGINX CONFIGURATION
+#=================================================
+
+ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"
+
+#=================================================
+# BACKUP THE PHP-FPM CONFIGURATION
+#=================================================
+
+ynh_backup "/etc/php/7.0/fpm/pool.d/$app.conf"
+
+#=================================================
+# BACKUP THE MYSQL DATABASE
+#=================================================
+
+ynh_mysql_dump_db "$db_name" > db.sql

scripts/install

@@ -150,4 +150,5 @@ fi
 # RELOAD NGINX
 #=================================================
 
+systemctl reload php7.0-fpm
 systemctl reload nginx

scripts/restore

@@ -1,24 +1,92 @@
 #!/bin/bash
-# DotClear 2 restore script for YunoHost
 
-app=dotclear2
+#=================================================
+# GENERIC START
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
 
-# The parameter $1 is the uncompressed restore directory location
+source ../settings/scripts/_common.sh
-backup_dir=$1/apps/$app
+source /usr/share/yunohost/helpers
 
-# Restore sources
+#=================================================
-sudo cp -a $backup_dir/sources/. /var/www/$app
+# MANAGE SCRIPT FAILURE
+#=================================================
 
-# Restore database
+ynh_clean_setup () {
-root_pwd=$(sudo cat /etc/yunohost/mysql)
+	#### Remove this function if there's nothing to clean before calling the remove script.
-mysql -u root -p$root_pwd -e "DROP DATABASE $app ; DROP USER $app@localhost ;"
+	true
-db_password=$(sudo yunohost app setting $app db_password)
+}
-sudo yunohost app initdb $app -p "$db_password" -s $backup_dir/dump.sql
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
 
-# Restore Nginx and YunoHost parameters
+#=================================================
-sudo cp -a $backup_dir/yunohost/. /etc/yunohost/apps/$app
+# LOAD SETTINGS
-domain=$(sudo yunohost app setting $app domain)
+#=================================================
-sudo cp -a $backup_dir/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
 
-# Restart webserver
+app=$YNH_APP_INSTANCE_NAME
-sudo /etc/init.d/nginx reload
+
+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 db_name)
+
+#=================================================
+# CHECK IF THE APP CAN BE RESTORED
+#=================================================
+
+ynh_webpath_available $domain $path_url \
+	|| ynh_die "Path not available: ${domain}${path_url}"
+test ! -d $final_path \
+	|| ynh_die "There is already a directory: $final_path "
+
+#=================================================
+# STANDARD RESTORATION STEPS
+#=================================================
+# RESTORE THE NGINX CONFIGURATION
+#=================================================
+
+ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf"
+
+#=================================================
+# RESTORE THE APP MAIN DIR
+#=================================================
+
+ynh_restore_file "$final_path"
+
+#=================================================
+# RESTORE THE MYSQL DATABASE
+#=================================================
+
+db_pwd=$(ynh_app_setting_get $app mysqlpwd)
+ynh_mysql_setup_db $db_name $db_name $db_pwd
+ynh_mysql_connect_as $db_name $db_pwd $db_name < ./db.sql
+
+#=================================================
+# RECREATE THE DEDICATED USER
+#=================================================
+
+# Create the dedicated user (if not existing)
+ynh_system_user_create $app
+
+#=================================================
+# RESTORE USER RIGHTS
+#=================================================
+
+# Restore permissions on app files
+chown -R $app: $final_path
+
+#=================================================
+# RESTORE THE PHP-FPM CONFIGURATION
+#=================================================
+
+ynh_restore_file "/etc/php/7.0/fpm/pool.d/$app.conf"
+
+#=================================================
+# GENERIC FINALIZATION
+#=================================================
+# RELOAD NGINX AND PHP-FPM
+#=================================================
+
+systemctl reload php7.0-fpm
+systemctl reload nginx