Update restore

scripts/restore

@@ -1,128 +1,52 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC START
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
 # Exit on command errors and treat access to unset variables as an error
 set -eu
 
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
-if [ ! -e _common.sh ]; then
-	# Get the _common.sh file if it's not in the current directory
-	sudo cp ../settings/scripts/_common.sh ./_common.sh
-	sudo chmod a+rx _common.sh
-fi
-source _common.sh
+# Source app helpers and functions
 source /usr/share/yunohost/helpers
 
-#=================================================
-# LOAD 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 db_name)
+# Retrieve arguments
+domain=$(ynh_app_setting_get "$app" domain)
+path=$(ynh_app_setting_get "$app" path)
+is_public=$(ynh_app_setting_get "$app" is_public)
 
-#=================================================
-# CHECK IF THE APP CAN BE RESTORED
-#=================================================
+# is_public is now a boolean field
+if [ "$is_public" = "Yes" ];
+then
+    is_public=1
+fi
 
-sudo yunohost app checkurl "${domain}${path_url}" -a "$app" \
-	|| ynh_die "Path not available: ${domain}${path_url}"
-test ! -d $final_path \
-	|| ynh_die "There is already a directory: $final_path "
+# Check domain/path availability
+sudo yunohost app checkurl $domain$path -a $app \
+  || ynh_die "The path ${domain}${path} is not available for app installation."
 
-#=================================================
-# STANDARD RESTORATION STEPS
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
+# Check destination directory
+DESTDIR="/var/www/$app"
+[[ -d $DESTDIR ]] && ynh_die \
+"The destination directory '$DESTDIR' already exists.\
+ You should safely delete it before restoring this app."
 
-ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf"
+# Check configuration files
+NGINX_CONF="/etc/nginx/conf.d/${domain}.d/${app}.conf"
+[[ -f $NGINX_CONF ]] && ynh_die \
+"The NGINX configuration already exists at '${NGINX_CONF}'.
+ You should safely delete it before restoring this app."
 
-#=================================================
-# RESTORE THE APP MAIN DIR
-#=================================================
+# Restore the app files
+sudo cp -a ./www "$DESTDIR"
 
-ynh_restore_file "$final_path"
+# Restore configuration files
+sudo cp -a ./conf/nginx.conf "$NGINX_CONF"
 
-#=================================================
-# RESTORE THE MYSQL DATABASE
-#=================================================
+# Make app public if necessary
+sudo yunohost app setting $app is_public -v "$is_public"
+if [[ "$is_public" -ne 0 ]];
+then
+    sudo yunohost app setting $app unprotected_uris -v "/"
+fi
 
-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
-sudo chown -R root: $final_path
-
-#=================================================
-# 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"
-
-#=================================================
-# SPECIFIC RESTORATION
-#=================================================
-# REINSTALL DEPENDENCIES
-#=================================================
-
-# Define and install dependencies
-ynh_install_app_dependencies deb1 deb2
-
-#=================================================
-# ADVERTISE SERVICE IN ADMIN PANEL
-#=================================================
-
-sudo yunohost service add $app --log "/var/log/$app/APP.log"
-
-#=================================================
-# RESTORE SYSTEMD
-#=================================================
-
-ynh_restore_file "/etc/systemd/system/$app.service"
-sudo systemctl enable $app.service
-
-#=================================================
-# RESTORE THE CRON FILE
-#=================================================
-
-ynh_restore_file "/etc/cron.d/$app"
-
-#=================================================
-# BACKUP THE LOGROTATE CONFIGURATION
-#=================================================
-
-ynh_restore_file "/etc/logrotate.d/$app"
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# RELOAD NGINX AND PHP-FPM
-#=================================================
-
-sudo systemctl reload php5-fpm
-sudo systemctl reload nginx
+# Reload Nginx and regenerate SSOwat conf
+sudo service nginx reload