From 4f902bc3a403f26e6d57065f6460bf12e01c6df9 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@forwardbias.in>
Date: Wed, 25 Mar 2015 11:19:54 -0700
Subject: [PATCH] Move box mysql dump

---
 setup/start.sh        | 8 +++++---
 src/scripts/backup.sh | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/setup/start.sh b/setup/start.sh
index cb9e3f913..157fddb59 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -58,7 +58,7 @@ mkdir -p "${CONFIG_DIR}/nginx/cert"
 mkdir -p "${CONFIG_DIR}/collectd/collectd.conf.d"
 EOF
 
-### code below can be removed
+#################################################################### code below can be removed
 [[ -d "${DATA_DIR}/appicons" ]] && mv ${DATA_DIR}/appicons/* "${DATA_DIR}/box/appicons"
 if [[ -d ${DATA_DIR}/appdata ]]; then
     for app in `ls -d /home/yellowtent/data/appdata/*`; do
@@ -66,6 +66,8 @@ if [[ -d ${DATA_DIR}/appdata ]]; then
         mv $app/.* "${DATA_DIR}/`basename $app`/data" || true
     done
 fi
+mv "${DATA_DIR}/box.mysqldump" "${DATA_DIR}/box/box.mysqldump" || true
+##########################################################################
 
 set_progress "20" "Configuring Sudoers file"
 cat > /etc/sudoers.d/yellowtent <<EOF
@@ -89,9 +91,9 @@ EOF
 set_progress "21" "Setting up MySQL"
 mysqladmin -u root -ppassword password password # reset default root password
 mysql -u root -ppassword -e 'CREATE DATABASE IF NOT EXISTS box'
-if [[ -f "${DATA_DIR}/box.mysqldump" ]]; then
+if [[ -f "${DATA_DIR}/box/box.mysqldump" ]]; then
     echo "Importing existing database into MySQL"
-    mysql -u root -ppassword box < "${DATA_DIR}/box.mysqldump"
+    mysql -u root -ppassword box < "${DATA_DIR}/box/box.mysqldump"
 fi
 
 set_progress "25" "Migrating data"
diff --git a/src/scripts/backup.sh b/src/scripts/backup.sh
index f69598d5a..042a6ec2e 100755
--- a/src/scripts/backup.sh
+++ b/src/scripts/backup.sh
@@ -25,7 +25,7 @@ now=$(date "+%Y-%m-%dT%H:%M:%S")
 DATA_DIR="${HOME}/data"
 
 echo "Creating MySQL dump"
-mysqldump -u root -ppassword --single-transaction --routines --triggers box > "${DATA_DIR}/box.mysqldump"
+mysqldump -u root -ppassword --single-transaction --routines --triggers box > "${DATA_DIR}/box/box.mysqldump"
 
 echo "Snapshoting backup as backup-${now}"
 btrfs subvolume snapshot -r "${DATA_DIR}" "${HOME}/backup-${now}"