From f946e86317bbfb9a6f8a28625fb416ed8064217a Mon Sep 17 00:00:00 2001
From: Thomas Karpiniec <tk@1.21jiggawatts.net>
Date: Sun, 7 Feb 2016 19:14:48 +1100
Subject: [PATCH] Add instructions for how to restore from backup using
 suggested method

---
 html/admin/backup_restore.html | 41 +++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/html/admin/backup_restore.html b/html/admin/backup_restore.html
index be9e159..6d9f059 100644
--- a/html/admin/backup_restore.html
+++ b/html/admin/backup_restore.html
@@ -34,11 +34,46 @@
 
 <p>
 	<tt>TIMESTAMP=$(date +%Y%m%d-%H%M)</tt><br />
-	<tt>mysqldump -u "database_username" -p "database_name" | xz -c - > "~/$TIMESTAMP-$DB_NAME.sql.xz"</tt><br />
-	(You will be prompted for a password. Type in the password for the MySQL user.)
+	<tt>mysqldump -u "database_username" -p "database_name" | xz -c - > "~/$TIMESTAMP-social.sql.xz"</tt>
 </p>
 
+<p>You will be prompted for a password. Type in the password for the MySQL user.</p>
+
+
+
 {HEADING:SECTION:restore_procedure:Restoring from a Backup}
 
-<p>TODO</p>
+<ol>
+	<li>Stop the queue daemons if they're running.</li>
+	<li>Restore the web files.</li>
+	<li>Restore the database.</li>
+	<li>Restart the queue daemons.</li>
+</ol>
 
+<p>If you followed the examples above you might type the following:</p>
+
+<pre>cd /var/www/social
+
+# Stop the daemons
+bash ./scripts/stopdaemons.sh
+
+# Delete and restore the web files
+rm -r *
+cd ..
+tar -Jxf ~/20160130-1200-social-www.tar.xz
+
+# Recreate the database (using MySQL root account)
+mysqladmin -u root -p drop social
+mysqladmin -u root -p create social
+mysql -u root -p social
+
+    # Inside mysql client
+    GRANT ALL on social.* TO 'social'@'localhost' IDENTIFIED BY 'the_old_password'; 
+    exit
+
+# Restore the database as the GNU social MySQL user
+xzcat ~/20160130-1200-social.sql.xz | mysql -u social -p social
+
+# Restart the queue daemons
+cd social
+bash ./scripts/startdaemons.sh</pre>