From 911ef6873c89ae2b564e407905d2266655e4f958 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob.mottram@codethink.co.uk>
Date: Tue, 8 Dec 2015 16:03:06 +0000
Subject: [PATCH] Restore Hubzilla command
---
Makefile | 4 +-
man/freedombone-restore-hubzilla.1.gz | Bin 0 -> 483 bytes
src/freedombone-backup-remote | 4 +-
src/freedombone-restore-hubzilla | 191 ++++++++++++++++++++++++++
src/freedombone-restore-remote | 3 +-
5 files changed, 198 insertions(+), 4 deletions(-)
create mode 100644 man/freedombone-restore-hubzilla.1.gz
create mode 100755 src/freedombone-restore-hubzilla
diff --git a/Makefile b/Makefile
index d892eef2..da93da9d 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,8 @@ install:
install -m 755 src/${APP}-backup-local ${DESTDIR}${PREFIX}/bin/backup
install -m 755 src/${APP}-backup-local ${DESTDIR}${PREFIX}/bin/backup2friends
install -m 755 src/${APP}-restore-local ${DESTDIR}${PREFIX}/bin/restore
- install -m 755 src/${APP}-restore-local ${DESTDIR}${PREFIX}/bin/restorefromfriend
+ install -m 755 src/${APP}-restore-remote ${DESTDIR}${PREFIX}/bin/restorefromfriend
+ install -m 755 src/${APP}-restore-hubzilla ${DESTDIR}${PREFIX}/bin/restorehubzilla
mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/man/man1
install -m 644 man/*.1.gz ${DESTDIR}${PREFIX}/share/man/man1
bash -c "./translate install"
@@ -36,6 +37,7 @@ uninstall:
rm -f ${PREFIX}/bin/backup2friends
rm -f ${PREFIX}/bin/restore
rm -f ${PREFIX}/bin/restorefromfriend
+ rm -f ${PREFIX}/bin/restorehubzilla
rm -f ${PREFIX}/bin/meshweb
rm -rf /etc/freedombone
bash -c "./translate uninstall"
diff --git a/man/freedombone-restore-hubzilla.1.gz b/man/freedombone-restore-hubzilla.1.gz
new file mode 100644
index 0000000000000000000000000000000000000000..2f4f1332e9a344c0620ce7c0187558e46caa5cf4
GIT binary patch
literal 483
zcmV<90UZ7xiwFRP{bp7G1BH=WkJ>O0h2Q-vMtR8-$u3nTimIx~E(O%(B9e5~+k@>4
z#3hN5$7V%;eN7rfyHdANo<?)d`OY}XXRtMhrEY|7abS?FHaMu9_^Ile!z~0iBe+Ki
z!<*aJ0R;a4a1}s7XhMPoZym1##-eNn!7^D)0`{Wsw*hQ^&j@Ch;nwH|iYx`e<=!27
zx9szBwa(_*e;mJ-cvKR<_p19zcDI?Y^Z9BSu*8C`5Ugqt^cJ3svZ~!(gC%c4OUX&;
zme=(O1WN69r8dSLESA9A5=g^IJ81X`o)lGJHS`ql!;!t(otIl}t8)g{gc0PGqRaC0
z!n~_o8g<0Jc+__&vSjKHnUHq`E`;$7x%G@4#~GT}9;yp>gb?-#mz#uOxbJOzdA}RJ
zbiR-=@ZU27pi(flGT<XQq{w$QcF&&H9(4RK4e$BWV(MRQg9mLa2)FY+EQ?a8tUb^;
zj(5s>Rpd_{3r>}h@gIn>B63K*RZ`@$)h1x67O>FP8s5NLp~ZWng|<pk<o1!(?^q-Z
zTTj>VbUhuzBzZF$PF{_=X{v04M0|&1NEd^ld~{Wl9zT^^Gpio-m%OCI-Tou0T$=(Z
Zd+1b;D8?PI=lwg2{Q`DgIj=nf005;H?-~FA
literal 0
HcmV?d00001
diff --git a/src/freedombone-backup-remote b/src/freedombone-backup-remote
index 24aff05e..b391ab2f 100755
--- a/src/freedombone-backup-remote
+++ b/src/freedombone-backup-remote
@@ -31,7 +31,7 @@
PROJECT_NAME='freedombone'
COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
-export TEXTDOMAIN=${PROJECT_NAME}-backup-local
+export TEXTDOMAIN=${PROJECT_NAME}-backup-remote
export TEXTDOMAINDIR="/usr/share/locale"
# Temporary location for data to be backed up to other servers
@@ -42,7 +42,7 @@ ADMIN_NAME=$(getent passwd $ADMIN_USERNAME | cut -d: -f5 | cut -d, -f1)
ADMIN_EMAIL_ADDRESS=${ADMIN_USERNAME}@${HOSTNAME}
if [ ! -f /etc/ssl/private/backup.key ]; then
echo $"Creating backup key"
- freedombone-addcert -h backup --dhkey 2048
+ ${PROJECT_NAME}-addcert -h backup --dhkey 2048
fi
if [ ! -f /home/${ADMIN_USERNAME}/backup.list ]; then
diff --git a/src/freedombone-restore-hubzilla b/src/freedombone-restore-hubzilla
new file mode 100755
index 00000000..138414da
--- /dev/null
+++ b/src/freedombone-restore-hubzilla
@@ -0,0 +1,191 @@
+#!/bin/bash
+#
+# .---. . .
+# | | |
+# |--- .--. .-. .-. .-.| .-. .--.--. |.-. .-. .--. .-.
+# | | (.-' (.-' ( | ( )| | | | )( )| | (.-'
+# ' ' --' --' -' - -' ' ' -' -' -' ' - --'
+#
+# Freedom in the Cloud
+#
+# Backup to local storage - typically a USB drive
+
+# License
+# =======
+#
+# Copyright (C) 2015 Bob Mottram <bob@robotics.uk.to>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+PROJECT_NAME='freedombone'
+COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
+
+export TEXTDOMAIN=${PROJECT_NAME}-restore-hubzilla
+export TEXTDOMAINDIR="/usr/share/locale"
+
+USB_DRIVE=/dev/sdb1
+if [ $1 ]; then
+ USB_DRIVE=/dev/${1}1
+fi
+USB_MOUNT=/mnt/usb
+
+# Get the admin username
+ADMIN_USERNAME=$(cat $COMPLETION_FILE | grep "Admin user" | awk -F ':' '{print $2}')
+if [ $2 ]; then
+ ADMIN_USERNAME=$2
+fi
+
+if [ ! -b $USB_DRIVE ]; then
+ echo $"Please attach a USB drive"
+ exit 1
+fi
+
+if [ ! -d $USB_MOUNT ]; then
+ mkdir $USB_MOUNT
+ if [ -f /dev/mapper/encrypted_usb ]; then
+ rm -rf /dev/mapper/encrypted_usb
+ fi
+ cryptsetup luksClose encrypted_usb
+ cryptsetup luksOpen $USB_DRIVE encrypted_usb
+ if [ "$?" = "0" ]; then
+ USB_DRIVE=/dev/mapper/encrypted_usb
+ fi
+ mount $USB_DRIVE $USB_MOUNT
+fi
+if [ ! -d $USB_MOUNT/backup ]; then
+ echo $"No backup directory found on the USB drive."
+ umount $USB_MOUNT
+ rm -rf $USB_MOUNT
+ exit 2
+fi
+
+echo $"Checking that admin user exists"
+if [ ! -d /home/$ADMIN_USERNAME ]; then
+ echo $"Username $ADMIN_USERNAME not found. Reinstall ${PROJECT_NAME} with this username."
+ umount $USB_MOUNT
+ rm -rf $USB_MOUNT
+ exit 295
+fi
+
+echo $"Copying GPG keys to root"
+cp -r /home/$ADMIN_USERNAME/.gnupg /root
+
+# MariaDB password
+DATABASE_PASSWORD=$(cat /root/dbpass)
+
+function restore_directory_from_usb {
+ BACKUP_CERTIFICATE=/etc/ssl/private/backup.key
+ if [ ! -d ${1} ]; then
+ mkdir ${1}
+ fi
+ obnam restore -r $USB_MOUNT/backup/${2} --to ${1}
+}
+
+function restore_database {
+ RESTORE_SUBDIR="root"
+
+ if [ -d $USB_MOUNT/backup/${1} ]; then
+ echo $"Restoring ${1} database"
+ restore_directory_from_usb "/root/temp${1}data" "${1}data"
+ if [ ! -f /root/temp${1}data/${RESTORE_SUBDIR}/temp${1}data/${1}.sql ]; then
+ echo $"Unable to restore ${1} database"
+ rm -rf /root/temp${1}data
+ umount $USB_MOUNT
+ rm -rf $USB_MOUNT
+ exit 503
+ fi
+ mysqlsuccess=$(mysql -u root --password=$DATABASE_PASSWORD ${1} -o < /root/temp${1}data/${RESTORE_SUBDIR}/temp${1}data/${1}.sql)
+ if [ ! "$?" = "0" ]; then
+ echo "$mysqlsuccess"
+ umount $USB_MOUNT
+ rm -rf $USB_MOUNT
+ exit 964
+ fi
+ shred -zu /root/temp${1}data/${RESTORE_SUBDIR}/temp${1}data/*
+ rm -rf /root/temp${1}data
+ echo $"Restoring ${1} installation"
+ if [ ! -d /root/temp${1} ]; then
+ mkdir /root/temp${1}
+ fi
+ restore_directory_from_usb "/root/temp${1}" "${1}"
+ RESTORE_SUBDIR="var"
+ if [ ${2} ]; then
+ if [ -d /var/www/${2}/htdocs ]; then
+ if [ -d /root/temp${1}/${RESTORE_SUBDIR}/www/${2}/htdocs ]; then
+ rm -rf /var/www/${2}/htdocs
+ mv /root/temp${1}/${RESTORE_SUBDIR}/www/${2}/htdocs /var/www/${2}/
+ if [ ! "$?" = "0" ]; then
+ umount $USB_MOUNT
+ rm -rf $USB_MOUNT
+ exit 683
+ fi
+ if [ -d /etc/letsencrypt/live/${2} ]; then
+ ln -s /etc/letsencrypt/live/${2}/privkey.pem /etc/ssl/private/${2}.key
+ ln -s /etc/letsencrypt/live/${2}/fullchain.pem /etc/ssl/certs/${2}.pem
+ else
+ # Ensure that the bundled SSL cert is being used
+ if [ -f /etc/ssl/certs/${2}.bundle.crt ]; then
+ sed -i "s|${2}.crt|${2}.bundle.crt|g" /etc/nginx/sites-available/${2}
+ fi
+ fi
+ fi
+ fi
+ fi
+ fi
+}
+
+# Restoring hubzilla
+if grep -q "Hubzilla domain" $COMPLETION_FILE; then
+ HUBZILLA_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Hubzilla domain" | awk -F ':' '{print $2}')
+ restore_database hubzilla ${HUBZILLA_DOMAIN_NAME}
+ if [ -d $USB_MOUNT/backup/hubzilla ]; then
+ if [ ! -d /var/www/${HUBZILLA_DOMAIN_NAME}/htdocs/store/[data]/smarty3 ]; then
+ mkdir -p /var/www/${HUBZILLA_DOMAIN_NAME}/htdocs/store/[data]/smarty3
+ fi
+ chmod 777 /var/www/${HUBZILLA_DOMAIN_NAME}/htdocs/store/[data]/smarty3
+ chown -R www-data:www-data /var/www/${HUBZILLA_DOMAIN_NAME}/htdocs/*
+ if [ -d /root/temphubzilla ]; then
+ rm -rf /root/temphubzilla
+ fi
+ fi
+fi
+
+sync
+
+# Unmount the USB drive
+umount $USB_MOUNT
+rm -rf $USB_MOUNT
+
+# Restart the web server
+systemctl restart nginx
+systemctl restart php5-fpm
+
+echo $"Setting permissions"
+for d in /home/*/ ; do
+ USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
+ if [[ $USERNAME != "git" ]]; then
+ chown -R $USERNAME:$USERNAME /home/$USERNAME
+ fi
+done
+
+if [[ $USB_DRIVE == /dev/mapper/encrypted_usb ]]; then
+ echo $"Unmount encrypted USB"
+ cryptsetup luksClose encrypted_usb
+fi
+if [ -f /dev/mapper/encrypted_usb ]; then
+ rm -rf /dev/mapper/encrypted_usb
+fi
+
+echo $"Hubzilla Restore from USB drive is complete. You can now remove it."
+exit 0
diff --git a/src/freedombone-restore-remote b/src/freedombone-restore-remote
index ee319255..0308135d 100755
--- a/src/freedombone-restore-remote
+++ b/src/freedombone-restore-remote
@@ -31,7 +31,7 @@
PROJECT_NAME='freedombone'
COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
-export TEXTDOMAIN=${PROJECT_NAME}-restore-local
+export TEXTDOMAIN=${PROJECT_NAME}-restore-remote
export TEXTDOMAINDIR="/usr/share/locale"
SERVER_NAME=$1
@@ -476,6 +476,7 @@ if grep -q "Gogs domain" $COMPLETION_FILE; then
fi
fi
+# restore wiki
if [ -d $SERVER_DIRECTORY/backup/wiki ]; then
WIKI_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Wiki domain" | awk -F ':' '{print $2}')
echo $"Restoring Wiki installation $WIKI_DOMAIN_NAME"