From 00e0369299e3c713a6de8b8544408ef6ddf26faf Mon Sep 17 00:00:00 2001
From: mbugeia <kanboard@mbugeia.eu>
Date: Mon, 8 Feb 2016 02:06:58 +0100
Subject: [PATCH] fix backup/restore

---
 scripts/backup  | 18 ++++++++++--------
 scripts/restore | 30 ++++++++++++++++++------------
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/scripts/backup b/scripts/backup
index 063808b..daf462c 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -6,11 +6,11 @@ set -e
 BACKUP_DIR=$1
 
 # The parameter $2 is the id of the app instance ex: strut__2
-app=$2
+APP=$2
 
 # retrieve useful param
-domain=$(sudo yunohost app setting $app domain)
-db_pwd=$(sudo yunohost app setting $app mysqlpwd)
+domain=$(sudo yunohost app setting ${APP} domain)
+db_pwd=$(sudo yunohost app setting ${APP} db_pwd)
 
 # Backup app files
 sudo mkdir -p "${BACKUP_DIR}/www"
@@ -18,8 +18,8 @@ sudo cp -a /var/www/$app/. "${BACKUP_DIR}/www"
 
 # Backup conf files
 sudo mkdir -p "${BACKUP_DIR}/conf"
-sudo cp -a /etc/nginx/conf.d/$domain.d/$app.conf "${BACKUP_DIR}/conf/${app}.conf"
-sudo cp -a /etc/logrotate.d/seafile "${BACKUP_DIR}/conf/seafile"
+sudo cp -a /etc/nginx/conf.d/$domain.d/$app.conf "${BACKUP_DIR}/conf/${APP}.conf"
+sudo cp -a /etc/logrotate.d/${APP} "${BACKUP_DIR}/conf/${APP}"
 sudo cp -a /etc/init.d/seafile-server "${BACKUP_DIR}/conf/seafile-server"
 
 # Backup data
@@ -27,6 +27,8 @@ sudo mkdir -p "${BACKUP_DIR}/data"
 sudo cp -a /home/yunohost.app/seafile-data/. "${BACKUP_DIR}/data"
 
 # Backup mysql
-sudo mysqldump -u $app -p$db_pwd ccnetdb > "${BACKUP_DIR}/ccnetdb.dmp"
-sudo mysqldump -u $app -p$db_pwd seafiledb > "${BACKUP_DIR}/seafiledb.dmp"
-sudo mysqldump -u $app -p$db_pwd seahubdb > "${BACKUP_DIR}/seahubdb.dmp"
\ No newline at end of file
+mysqldump -u ${APP} -p$db_pwd ccnetdb | sudo dd of=${BACKUP_DIR}/ccnetdb.dmp
+mysqldump -u ${APP} -p$db_pwd seafiledb | sudo dd of=${BACKUP_DIR}/seafiledb.dmp
+mysqldump -u ${APP} -p$db_pwd seahubdb | sudo dd of=${BACKUP_DIR}/seahubdb.dmp
+
+exit 0
\ No newline at end of file
diff --git a/scripts/restore b/scripts/restore
index f97272f..64a1d7d 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -6,14 +6,15 @@ set -e
 BACKUP_DIR=$1
 
 # The parameter $2 is the id of the app instance ex: strut__2
-app=$2
+APP=$2
 
-domain=$(sudo yunohost app setting $app domain)
-path=$(sudo yunohost app setting $app path)
-db_pwd=$(sudo yunohost app setting $app mysqlpwd)
+# retrieve useful param
+domain=$(sudo yunohost app setting ${APP} domain)
+db_pwd=$(sudo yunohost app setting ${APP} db_pwd)
+path=$(sudo yunohost app setting ${APP} path)
 
 # Check domain/path availability
-sudo yunohost app checkurl $domain$path -a $app  \
+sudo yunohost app checkurl $domain$path -a ${APP}  \
     || (echo "Path not available: $domain$path" && exit 1)
 
 # Restore dependencies
@@ -21,14 +22,14 @@ sudo apt-get update
 sudo apt-get install -qq python2.7 python-setuptools python-simplejson python-imaging python-mysqldb python-flup expect
 
 # Restore app files
-final_path=/var/www/$app
+final_path=/var/www/${APP}
 sudo mkdir -p $final_path
 sudo cp -a "${BACKUP_DIR}/www/." $final_path
 sudo chown -R www-data:www-data $final_path
 
 # Restore conf files
-sudo cp -a "${BACKUP_DIR}/conf/${app}.conf" /etc/nginx/conf.d/$domain.d/$app.conf
-sudo cp -a "${BACKUP_DIR}/conf/seafile" /etc/logrotate.d/seafile
+sudo cp -a "${BACKUP_DIR}/conf/${APP}.conf" /etc/nginx/conf.d/$domain.d/${APP}.conf
+sudo cp -a "${BACKUP_DIR}/conf/${APP}" /etc/logrotate.d/${APP}
 sudo cp -a "${BACKUP_DIR}/conf/seafile-server" /etc/init.d/seafile-server
 sudo chmod +x /etc/init.d/seafile-server
 
@@ -39,9 +40,12 @@ sudo cp -a "${BACKUP_DIR}/data/." /home/yunohost.app/seafile-data/.
 sudo chown -R www-data:www-data $seafile_data
 
 # Restore mysql dump
-sudo mysql -u $app -p$db_pwd ccnetdb < "${BACKUP_DIR}/ccnetdb.dmp"
-sudo mysql -u $app -p$db_pwd seafiledb < "${BACKUP_DIR}/seafiledb.dmp"
-sudo mysql -u $app -p$db_pwd seahubdb < "${BACKUP_DIR}/seahubdb.dmp"
+sudo su -c "mysql -u ${APP} -p$db_pwd ccnetdb < ${BACKUP_DIR}/ccnetdb.dmp"
+sudo su -c "mysql -u ${APP} -p$db_pwd seafiledb < ${BACKUP_DIR}/seafiledb.dmp"
+sudo su -c "mysql -u ${APP} -p$db_pwd seahubdb < ${BACKUP_DIR}/seahubdb.dmp"
+
+# Restore sso persistent config
+sudo python $final_path/add_sso_conf.py
 
 # Add Seafile to YunoHost's monitored services
 sudo yunohost service add seafile-server
@@ -53,4 +57,6 @@ sudo service nginx reload
 sudo yunohost app ssowatconf
 
 # start seafile
-sudo service seafile-server start
\ No newline at end of file
+sudo service seafile-server start
+
+exit 0
\ No newline at end of file