From e42e952a1282fb89cf423f4b486d6fbdfecb6af7 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 9 Dec 2015 09:38:51 +0000 Subject: [PATCH] Get default USB drive from config file --- src/freedombone-backup-local | 8 + src/freedombone-restore-hubzilla | 196 +++--- src/freedombone-restore-local | 1106 +++++++++++++++--------------- 3 files changed, 667 insertions(+), 643 deletions(-) diff --git a/src/freedombone-backup-local b/src/freedombone-backup-local index f2c5c1a8..fc7416ea 100755 --- a/src/freedombone-backup-local +++ b/src/freedombone-backup-local @@ -37,6 +37,14 @@ export TEXTDOMAINDIR="/usr/share/locale" USB_DRIVE=/dev/sdb1 USB_MOUNT=/mnt/usb +# get default USB from config file +CONFIG_FILE=$HOME/${PROJECT_NAME}.cfg +if [ -f $CONFIG_FILE ]; then + if grep -q "USB_DRIVE=" $CONFIG_FILE; then + USB_DRIVE=$(cat $CONFIG_FILE | grep "USB_DRIVE=" | awk -F '=' '{print $2}') + fi +fi + ADMIN_USERNAME= ADMIN_NAME= diff --git a/src/freedombone-restore-hubzilla b/src/freedombone-restore-hubzilla index 138414da..ee7d4733 100755 --- a/src/freedombone-restore-hubzilla +++ b/src/freedombone-restore-hubzilla @@ -36,46 +36,54 @@ export TEXTDOMAINDIR="/usr/share/locale" USB_DRIVE=/dev/sdb1 if [ $1 ]; then - USB_DRIVE=/dev/${1}1 + USB_DRIVE=/dev/${1}1 fi USB_MOUNT=/mnt/usb +# get default USB from config file +CONFIG_FILE=$HOME/${PROJECT_NAME}.cfg +if [ -f $CONFIG_FILE ]; then + if grep -q "USB_DRIVE=" $CONFIG_FILE; then + USB_DRIVE=$(cat $CONFIG_FILE | grep "USB_DRIVE=" | awk -F '=' '{print $2}') + fi +fi + # Get the admin username ADMIN_USERNAME=$(cat $COMPLETION_FILE | grep "Admin user" | awk -F ':' '{print $2}') if [ $2 ]; then - ADMIN_USERNAME=$2 + ADMIN_USERNAME=$2 fi if [ ! -b $USB_DRIVE ]; then - echo $"Please attach a USB drive" - exit 1 + 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 + 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 + 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 + 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" @@ -85,80 +93,80 @@ cp -r /home/$ADMIN_USERNAME/.gnupg /root 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} + 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" + 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 + 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 + 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 @@ -173,18 +181,18 @@ 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 + 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 + echo $"Unmount encrypted USB" + cryptsetup luksClose encrypted_usb fi if [ -f /dev/mapper/encrypted_usb ]; then - rm -rf /dev/mapper/encrypted_usb + rm -rf /dev/mapper/encrypted_usb fi echo $"Hubzilla Restore from USB drive is complete. You can now remove it." diff --git a/src/freedombone-restore-local b/src/freedombone-restore-local index 4eb3c819..f2c830f8 100755 --- a/src/freedombone-restore-local +++ b/src/freedombone-restore-local @@ -36,46 +36,54 @@ export TEXTDOMAINDIR="/usr/share/locale" USB_DRIVE=/dev/sdb1 if [ $1 ]; then - USB_DRIVE=/dev/${1}1 + USB_DRIVE=/dev/${1}1 fi USB_MOUNT=/mnt/usb +# get default USB from config file +CONFIG_FILE=$HOME/${PROJECT_NAME}.cfg +if [ -f $CONFIG_FILE ]; then + if grep -q "USB_DRIVE=" $CONFIG_FILE; then + USB_DRIVE=$(cat $CONFIG_FILE | grep "USB_DRIVE=" | awk -F '=' '{print $2}') + fi +fi + # Get the admin username ADMIN_USERNAME=$(cat $COMPLETION_FILE | grep "Admin user" | awk -F ':' '{print $2}') if [ $2 ]; then - ADMIN_USERNAME=$2 + ADMIN_USERNAME=$2 fi if [ ! -b $USB_DRIVE ]; then - echo $"Please attach a USB drive" - exit 1 + 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 + 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 + 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 + 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" @@ -85,107 +93,107 @@ cp -r /home/$ADMIN_USERNAME/.gnupg /root 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} + 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" + 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 + 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 } # Make a backup of the original README file # incase old passwords need to be used if [ -f /home/$ADMIN_USERNAME/README ]; then - if [ ! -f /home/$ADMIN_USERNAME/README_original ]; then - cp /home/$ADMIN_USERNAME/README /home/$ADMIN_USERNAME/README_original - fi + if [ ! -f /home/$ADMIN_USERNAME/README_original ]; then + cp /home/$ADMIN_USERNAME/README /home/$ADMIN_USERNAME/README_original + fi fi if [ -d $USB_MOUNT/backup/mariadb ]; then - echo $"Restoring mysql settings" - restore_directory_from_usb /root/tempmariadb mariadb - echo $"Get the MariaDB password from the backup" - if [ ! -f /root/tempmariadb/root/tempmariadb/db ]; then - echo $"MariaDB password file not found" - exit 495 - fi - BACKUP_MARIADB_PASSWORD=$(cat /root/tempmariadb/root/tempmariadb/db) - if [[ $BACKUP_MARIADB_PASSWORD != $DATABASE_PASSWORD ]]; then - echo $"Restore the MariaDB user table" - mysqlsuccess=$(mysql -u root --password=$DATABASE_PASSWORD mysql -o < /root/tempmariadb/root/tempmariadb/mysql.sql) - if [ ! "$?" = "0" ]; then - echo $"Try again using the password obtained from backup" - mysqlsuccess=$(mysql -u root --password=$BACKUP_MARIADB_PASSWORD mysql -o < /root/tempmariadb/root/tempmariadb/mysql.sql) - fi - if [ ! "$?" = "0" ]; then - echo "$mysqlsuccess" - umount $USB_MOUNT - rm -rf $USB_MOUNT - exit 962 - fi - echo $"Restarting database" - service mysql restart - echo $"Change the MariaDB password to the backup version" - DATABASE_PASSWORD=$BACKUP_MARIADB_PASSWORD - fi - shred -zu /root/tempmariadb/root/tempmariadb/db - rm -rf /root/tempmariadb + echo $"Restoring mysql settings" + restore_directory_from_usb /root/tempmariadb mariadb + echo $"Get the MariaDB password from the backup" + if [ ! -f /root/tempmariadb/root/tempmariadb/db ]; then + echo $"MariaDB password file not found" + exit 495 + fi + BACKUP_MARIADB_PASSWORD=$(cat /root/tempmariadb/root/tempmariadb/db) + if [[ $BACKUP_MARIADB_PASSWORD != $DATABASE_PASSWORD ]]; then + echo $"Restore the MariaDB user table" + mysqlsuccess=$(mysql -u root --password=$DATABASE_PASSWORD mysql -o < /root/tempmariadb/root/tempmariadb/mysql.sql) + if [ ! "$?" = "0" ]; then + echo $"Try again using the password obtained from backup" + mysqlsuccess=$(mysql -u root --password=$BACKUP_MARIADB_PASSWORD mysql -o < /root/tempmariadb/root/tempmariadb/mysql.sql) + fi + if [ ! "$?" = "0" ]; then + echo "$mysqlsuccess" + umount $USB_MOUNT + rm -rf $USB_MOUNT + exit 962 + fi + echo $"Restarting database" + service mysql restart + echo $"Change the MariaDB password to the backup version" + DATABASE_PASSWORD=$BACKUP_MARIADB_PASSWORD + fi + shred -zu /root/tempmariadb/root/tempmariadb/db + rm -rf /root/tempmariadb - # Change database password file - echo "$DATABASE_PASSWORD" > /root/dbpass - chmod 600 /root/dbpass + # Change database password file + echo "$DATABASE_PASSWORD" > /root/dbpass + chmod 600 /root/dbpass fi if [ -d $USB_MOUNT/backup/letsencrypt ]; then @@ -194,515 +202,515 @@ if [ -d $USB_MOUNT/backup/letsencrypt ]; then fi if [ -d $USB_MOUNT/backup/mutt ]; then - for d in $USB_MOUNT/backup/mutt/*/ ; do - USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" ]]; then - if [ ! -d /home/$USERNAME ]; then - ${PROJECT_NAME}-adduser $USERNAME - fi - echo $"Restoring Mutt settings for $USERNAME" - restore_directory_from_usb /root/tempmutt mutt/$USERNAME - if [ -f /root/tempmutt/home/$USERNAME/tempbackup/.muttrc ]; then - cp -f /root/tempmutt/home/$USERNAME/tempbackup/.muttrc /home/$USERNAME/.muttrc - fi - if [ -f /root/tempmutt/home/$USERNAME/tempbackup/Muttrc ]; then - cp -f /root/tempmutt/home/$USERNAME/tempbackup/Muttrc /etc/Muttrc - fi - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - rm -rf /root/tempmutt - exit 276 - fi - rm -rf /root/tempmutt - fi - done + for d in $USB_MOUNT/backup/mutt/*/ ; do + USERNAME=$(echo "$d" | awk -F '/' '{print $6}') + if [[ $USERNAME != "git" ]]; then + if [ ! -d /home/$USERNAME ]; then + ${PROJECT_NAME}-adduser $USERNAME + fi + echo $"Restoring Mutt settings for $USERNAME" + restore_directory_from_usb /root/tempmutt mutt/$USERNAME + if [ -f /root/tempmutt/home/$USERNAME/tempbackup/.muttrc ]; then + cp -f /root/tempmutt/home/$USERNAME/tempbackup/.muttrc /home/$USERNAME/.muttrc + fi + if [ -f /root/tempmutt/home/$USERNAME/tempbackup/Muttrc ]; then + cp -f /root/tempmutt/home/$USERNAME/tempbackup/Muttrc /etc/Muttrc + fi + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + rm -rf /root/tempmutt + exit 276 + fi + rm -rf /root/tempmutt + fi + done fi if [ -d $USB_MOUNT/backup/gnupg ]; then - for d in $USB_MOUNT/backup/gnupg/*/ ; do - USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" ]]; then - if [ ! -d /home/$USERNAME ]; then - ${PROJECT_NAME}-adduser $USERNAME - fi - echo $"Restoring gnupg settings for $USERNAME" - restore_directory_from_usb /root/tempgnupg gnupg/$USERNAME - cp -r /root/tempgnupg/home/$USERNAME/.gnupg /home/$USERNAME/ - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - rm -rf /root/tempgnupg - exit 276 - fi - rm -rf /root/tempgnupg - if [[ "$USERNAME" == "$ADMIN_USERNAME" ]]; then - cp -r /home/$USERNAME/.gnupg /root - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - exit 283 - fi - fi - fi - done + for d in $USB_MOUNT/backup/gnupg/*/ ; do + USERNAME=$(echo "$d" | awk -F '/' '{print $6}') + if [[ $USERNAME != "git" ]]; then + if [ ! -d /home/$USERNAME ]; then + ${PROJECT_NAME}-adduser $USERNAME + fi + echo $"Restoring gnupg settings for $USERNAME" + restore_directory_from_usb /root/tempgnupg gnupg/$USERNAME + cp -r /root/tempgnupg/home/$USERNAME/.gnupg /home/$USERNAME/ + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + rm -rf /root/tempgnupg + exit 276 + fi + rm -rf /root/tempgnupg + if [[ "$USERNAME" == "$ADMIN_USERNAME" ]]; then + cp -r /home/$USERNAME/.gnupg /root + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + exit 283 + fi + fi + fi + done fi if [ -d $USB_MOUNT/backup/procmail ]; then - for d in $USB_MOUNT/backup/procmail/*/ ; do - USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" ]]; then - if [ ! -d /home/$USERNAME ]; then - ${PROJECT_NAME}-adduser $USERNAME - fi - echo $"Restoring procmail settings for $USERNAME" - restore_directory_from_usb /root/tempprocmail procmail/$USERNAME - cp -f /root/tempprocmail/home/$USERNAME/tempbackup/.procmailrc /home/$USERNAME/ - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - rm -rf /root/tempprocmail - exit 276 - fi - rm -rf /root/tempprocmail - fi - done + for d in $USB_MOUNT/backup/procmail/*/ ; do + USERNAME=$(echo "$d" | awk -F '/' '{print $6}') + if [[ $USERNAME != "git" ]]; then + if [ ! -d /home/$USERNAME ]; then + ${PROJECT_NAME}-adduser $USERNAME + fi + echo $"Restoring procmail settings for $USERNAME" + restore_directory_from_usb /root/tempprocmail procmail/$USERNAME + cp -f /root/tempprocmail/home/$USERNAME/tempbackup/.procmailrc /home/$USERNAME/ + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + rm -rf /root/tempprocmail + exit 276 + fi + rm -rf /root/tempprocmail + fi + done fi if [ -d $USB_MOUNT/backup/spamassassin ]; then - for d in $USB_MOUNT/backup/spamassassin/*/ ; do - USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" ]]; then - if [ -d $USB_MOUNT/backup/spamassassin/$USERNAME ]; then - if [ ! -d /home/$USERNAME ]; then - ${PROJECT_NAME}-adduser $USERNAME - fi - echo $"Restoring spamassassin settings for $USERNAME" - restore_directory_from_usb /root/tempspamassassin spamassassin/$USERNAME - cp -rf /root/tempspamassassin/home/$USERNAME/.spamassassin /home/$USERNAME/ - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - rm -rf /root/tempspamassassin - exit 276 - fi - rm -rf /root/tempspamassassin - fi - fi - done + for d in $USB_MOUNT/backup/spamassassin/*/ ; do + USERNAME=$(echo "$d" | awk -F '/' '{print $6}') + if [[ $USERNAME != "git" ]]; then + if [ -d $USB_MOUNT/backup/spamassassin/$USERNAME ]; then + if [ ! -d /home/$USERNAME ]; then + ${PROJECT_NAME}-adduser $USERNAME + fi + echo $"Restoring spamassassin settings for $USERNAME" + restore_directory_from_usb /root/tempspamassassin spamassassin/$USERNAME + cp -rf /root/tempspamassassin/home/$USERNAME/.spamassassin /home/$USERNAME/ + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + rm -rf /root/tempspamassassin + exit 276 + fi + rm -rf /root/tempspamassassin + fi + fi + done fi if [ -d $USB_MOUNT/backup/readme ]; then - echo $"Restoring admin user README" - restore_directory_from_usb /root/tempreadme readme - cp -f /root/tempreadme/home/$ADMIN_USERNAME/tempbackup/README /home/$ADMIN_USERNAME/ - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - rm -rf /root/tempreadme - exit 276 - fi - rm -rf /root/tempreadme + echo $"Restoring admin user README" + restore_directory_from_usb /root/tempreadme readme + cp -f /root/tempreadme/home/$ADMIN_USERNAME/tempbackup/README /home/$ADMIN_USERNAME/ + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + rm -rf /root/tempreadme + exit 276 + fi + rm -rf /root/tempreadme fi if [ -d $USB_MOUNT/backup/ipfs ]; then - echo $"Restoring IPFS" - restore_directory_from_usb /root/tempipfs ipfs - cp -rf /root/tempipfs/home/$ADMIN_USERNAME/.ipfs/* /home/$ADMIN_USERNAME/.ipfs - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - rm -rf /root/tempipfs - exit 276 - fi - rm -rf /root/tempipfs + echo $"Restoring IPFS" + restore_directory_from_usb /root/tempipfs ipfs + cp -rf /root/tempipfs/home/$ADMIN_USERNAME/.ipfs/* /home/$ADMIN_USERNAME/.ipfs + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + rm -rf /root/tempipfs + exit 276 + fi + rm -rf /root/tempipfs fi if [ -d $USB_MOUNT/backup/ssh ]; then - for d in $USB_MOUNT/backup/ssh/*/ ; do - USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" ]]; then - if [ ! -d /home/$USERNAME ]; then - ${PROJECT_NAME}-adduser $USERNAME - fi - echo $"Restoring ssh keys for $USERNAME" - restore_directory_from_usb /root/tempssh ssh/$USERNAME - cp -r /root/tempssh/home/$USERNAME/.ssh /home/$USERNAME/ - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - rm -rf /root/tempssh - exit 664 - fi - rm -rf /root/tempssh - fi - done + for d in $USB_MOUNT/backup/ssh/*/ ; do + USERNAME=$(echo "$d" | awk -F '/' '{print $6}') + if [[ $USERNAME != "git" ]]; then + if [ ! -d /home/$USERNAME ]; then + ${PROJECT_NAME}-adduser $USERNAME + fi + echo $"Restoring ssh keys for $USERNAME" + restore_directory_from_usb /root/tempssh ssh/$USERNAME + cp -r /root/tempssh/home/$USERNAME/.ssh /home/$USERNAME/ + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + rm -rf /root/tempssh + exit 664 + fi + rm -rf /root/tempssh + fi + done fi if [ -d $USB_MOUNT/backup/config ]; then - for d in $USB_MOUNT/backup/config/*/ ; do - USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" ]]; then - if [ ! -d /home/$USERNAME ]; then - ${PROJECT_NAME}-adduser $USERNAME - fi - echo $"Restoring config files for $USERNAME" - restore_directory_from_usb /root/tempconfig config/$USERNAME - cp -r /root/tempconfig/home/$USERNAME/.config /home/$USERNAME/ - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - rm -rf /root/tempconfig - exit 664 - fi - rm -rf /root/tempconfig - fi - done + for d in $USB_MOUNT/backup/config/*/ ; do + USERNAME=$(echo "$d" | awk -F '/' '{print $6}') + if [[ $USERNAME != "git" ]]; then + if [ ! -d /home/$USERNAME ]; then + ${PROJECT_NAME}-adduser $USERNAME + fi + echo $"Restoring config files for $USERNAME" + restore_directory_from_usb /root/tempconfig config/$USERNAME + cp -r /root/tempconfig/home/$USERNAME/.config /home/$USERNAME/ + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + rm -rf /root/tempconfig + exit 664 + fi + rm -rf /root/tempconfig + fi + done fi if [ -d $USB_MOUNT/backup/ssl ]; then - echo $"Restoring certificates" - mkdir /root/tempssl - restore_directory_from_usb /root/tempssl ssl - cp -r /root/tempssl/etc/ssl/* /etc/ssl - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - exit 276 - fi - rm -rf /root/tempssl + echo $"Restoring certificates" + mkdir /root/tempssl + restore_directory_from_usb /root/tempssl ssl + cp -r /root/tempssl/etc/ssl/* /etc/ssl + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + exit 276 + fi + rm -rf /root/tempssl fi if [ -d $USB_MOUNT/backup/projects ]; then - for d in $USB_MOUNT/backup/projects/*/ ; do - USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" ]]; then - if [ ! -d /home/$USERNAME ]; then - ${PROJECT_NAME}-adduser $USERNAME - fi - echo $"Restoring projects for $USERNAME" - restore_directory_from_usb /root/tempprojects projects/$USERNAME - if [ -d /home/$USERNAME/projects ]; then - rm -rf /home/$USERNAME/projects - fi - mv /root/tempprojects/home/$USERNAME/projects /home/$USERNAME - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - exit 166 - fi - rm -rf /root/tempprojects - fi - done + for d in $USB_MOUNT/backup/projects/*/ ; do + USERNAME=$(echo "$d" | awk -F '/' '{print $6}') + if [[ $USERNAME != "git" ]]; then + if [ ! -d /home/$USERNAME ]; then + ${PROJECT_NAME}-adduser $USERNAME + fi + echo $"Restoring projects for $USERNAME" + restore_directory_from_usb /root/tempprojects projects/$USERNAME + if [ -d /home/$USERNAME/projects ]; then + rm -rf /home/$USERNAME/projects + fi + mv /root/tempprojects/home/$USERNAME/projects /home/$USERNAME + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + exit 166 + fi + rm -rf /root/tempprojects + fi + done fi if [ -d $USB_MOUNT/backup/personal ]; then - for d in $USB_MOUNT/backup/personal/*/ ; do - USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" ]]; then - if [ -d $USB_MOUNT/backup/personal/$USERNAME ]; then - if [ ! -d /home/$USERNAME ]; then - ${PROJECT_NAME}-adduser $USERNAME - fi - echo $"Restoring personal settings for $USERNAME" - restore_directory_from_usb /root/temppersonal personal/$USERNAME - if [ -d /home/$USERNAME/personal ]; then - rm -rf /home/$USERNAME/personal - fi - mv /root/temppersonal/home/$USERNAME/personal /home/$USERNAME - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - exit 184 - fi - rm -rf /root/temppersonal - fi - fi - done + for d in $USB_MOUNT/backup/personal/*/ ; do + USERNAME=$(echo "$d" | awk -F '/' '{print $6}') + if [[ $USERNAME != "git" ]]; then + if [ -d $USB_MOUNT/backup/personal/$USERNAME ]; then + if [ ! -d /home/$USERNAME ]; then + ${PROJECT_NAME}-adduser $USERNAME + fi + echo $"Restoring personal settings for $USERNAME" + restore_directory_from_usb /root/temppersonal personal/$USERNAME + if [ -d /home/$USERNAME/personal ]; then + rm -rf /home/$USERNAME/personal + fi + mv /root/temppersonal/home/$USERNAME/personal /home/$USERNAME + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + exit 184 + fi + rm -rf /root/temppersonal + fi + fi + done fi if [ -d /var/spool/mlmmj ]; then - echo $"Restoring public mailing list" - restore_directory_from_usb /root/tempmailinglist mailinglist - cp -r /root/tempmailinglist/root/spool/mlmmj/* /var/spool/mlmmj - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - exit 526 - fi - rm -rf /root/tempmailinglist + echo $"Restoring public mailing list" + restore_directory_from_usb /root/tempmailinglist mailinglist + cp -r /root/tempmailinglist/root/spool/mlmmj/* /var/spool/mlmmj + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + exit 526 + fi + rm -rf /root/tempmailinglist fi if [ -d /var/lib/prosody ]; then - echo $"Restoring XMPP settings" - restore_directory_from_usb /root/tempxmpp xmpp - cp -r /root/tempxmpp/var/lib/prosody/* /var/lib/prosody - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - exit 725 - fi - rm -rf /root/tempxmpp - service prosody restart - chown -R prosody:prosody /var/lib/prosody/* + echo $"Restoring XMPP settings" + restore_directory_from_usb /root/tempxmpp xmpp + cp -r /root/tempxmpp/var/lib/prosody/* /var/lib/prosody + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + exit 725 + fi + rm -rf /root/tempxmpp + service prosody restart + chown -R prosody:prosody /var/lib/prosody/* fi # Restoring GNU Social if grep -q "GNU Social domain" $COMPLETION_FILE; then MICROBLOG_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "GNU Social domain" | awk -F ':' '{print $2}') - restore_database gnusocial ${MICROBLOG_DOMAIN_NAME} - if [ -d /root/tempgnusocial ]; then - rm -rf /root/tempgnusocial - fi + restore_database gnusocial ${MICROBLOG_DOMAIN_NAME} + if [ -d /root/tempgnusocial ]; then + rm -rf /root/tempgnusocial + 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 + 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 if grep -q "Owncloud domain" $COMPLETION_FILE; then OWNCLOUD_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Owncloud domain" | awk -F ':' '{print $2}') - restore_database owncloud $OWNCLOUD_DOMAIN_NAME - if [ -d $USB_MOUNT/backup/owncloud2 ]; then - restore_directory_from_usb /root/tempowncloud2 owncloud2 - cp -r /root/tempowncloud2/etc/owncloud/* /etc/owncloud/ - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - exit 982 - fi - rm -rf /root/tempowncloud - rm -rf /root/tempowncloud2 - chown -R www-data:www-data /var/lib/owncloud/data - chown -R www-data:www-data /var/lib/owncloud/backup - chown -R www-data:www-data /var/lib/owncloud/assets - for d in /home/*/ ; do - USERNAME=$(echo "$d" | awk -F '/' '{print $3}') - if [[ $USERNAME != "git" ]]; then - occ files:scan $USERNAME - fi - done - ln -s /usr/share/owncloud /var/www/${OWNCLOUD_DOMAIN_NAME}/htdocs - fi + restore_database owncloud $OWNCLOUD_DOMAIN_NAME + if [ -d $USB_MOUNT/backup/owncloud2 ]; then + restore_directory_from_usb /root/tempowncloud2 owncloud2 + cp -r /root/tempowncloud2/etc/owncloud/* /etc/owncloud/ + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + exit 982 + fi + rm -rf /root/tempowncloud + rm -rf /root/tempowncloud2 + chown -R www-data:www-data /var/lib/owncloud/data + chown -R www-data:www-data /var/lib/owncloud/backup + chown -R www-data:www-data /var/lib/owncloud/assets + for d in /home/*/ ; do + USERNAME=$(echo "$d" | awk -F '/' '{print $3}') + if [[ $USERNAME != "git" ]]; then + occ files:scan $USERNAME + fi + done + ln -s /usr/share/owncloud /var/www/${OWNCLOUD_DOMAIN_NAME}/htdocs + fi fi if grep -q "Gogs domain" $COMPLETION_FILE; then GIT_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Gogs domain" | awk -F ':' '{print $2}') - restore_database gogs ${GIT_DOMAIN_NAME} - if [ -d $USB_MOUNT/backup/gogs ]; then - echo $"Restoring Gogs settings" - if [ ! -d /home/git/go/src/github.com/gogits/gogs/custom ]; then - mkdir -p /home/git/go/src/github.com/gogits/gogs/custom - fi - cp -r /root/tempgogs/home/git/go/src/github.com/gogits/gogs/custom/* /home/git/go/src/github.com/gogits/gogs/custom - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - exit 981 - fi - echo $"Restoring Gogs repos" - restore_directory_from_usb /root/tempgogsrepos gogsrepos - cp -r /root/tempgogsrepos/home/git/gogs-repositories/* /home/git/gogs-repositories/ - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - exit 67574 - fi - echo $"Restoring Gogs authorized_keys" - restore_directory_from_usb /root/tempgogsssh gogsssh - if [ ! -d /home/git/.ssh ]; then - mkdir /home/git/.ssh - fi - cp -r /root/tempgogsssh/home/git/.ssh/* /home/git/.ssh/ - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - exit 8463 - fi - rm -rf /root/tempgogs - rm -rf /root/tempgogsrepos - rm -rf /root/tempgogsssh - chown -R git:git /home/git - fi + restore_database gogs ${GIT_DOMAIN_NAME} + if [ -d $USB_MOUNT/backup/gogs ]; then + echo $"Restoring Gogs settings" + if [ ! -d /home/git/go/src/github.com/gogits/gogs/custom ]; then + mkdir -p /home/git/go/src/github.com/gogits/gogs/custom + fi + cp -r /root/tempgogs/home/git/go/src/github.com/gogits/gogs/custom/* /home/git/go/src/github.com/gogits/gogs/custom + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + exit 981 + fi + echo $"Restoring Gogs repos" + restore_directory_from_usb /root/tempgogsrepos gogsrepos + cp -r /root/tempgogsrepos/home/git/gogs-repositories/* /home/git/gogs-repositories/ + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + exit 67574 + fi + echo $"Restoring Gogs authorized_keys" + restore_directory_from_usb /root/tempgogsssh gogsssh + if [ ! -d /home/git/.ssh ]; then + mkdir /home/git/.ssh + fi + cp -r /root/tempgogsssh/home/git/.ssh/* /home/git/.ssh/ + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + exit 8463 + fi + rm -rf /root/tempgogs + rm -rf /root/tempgogsrepos + rm -rf /root/tempgogsssh + chown -R git:git /home/git + fi fi if [ -d $USB_MOUNT/backup/wiki ]; then WIKI_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Wiki domain" | awk -F ':' '{print $2}') - echo $"Restoring Wiki installation ${WIKI_DOMAIN_NAME}" - restore_directory_from_usb /root/tempwiki wiki - cp -r /root/tempwiki/var/lib/dokuwiki/* /var/lib/dokuwiki/ - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - exit 868 - fi - restore_directory_from_usb /root/tempwiki2 wiki2 - cp -r /root/tempwiki2/etc/dokuwiki/* /etc/dokuwiki/ - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - exit 869 - fi - rm -rf /root/tempwiki - rm -rf /root/tempwiki2 - chown -R www-data:www-data /var/lib/dokuwiki/* - # Ensure that the bundled SSL cert is being used - if [ -f /etc/ssl/certs/${WIKI_DOMAIN_NAME}.bundle.crt ]; then - sed -i "s|${WIKI_DOMAIN_NAME}.crt|${WIKI_DOMAIN_NAME}.bundle.crt|g" /etc/nginx/sites-available/${WIKI_DOMAIN_NAME} - fi - if [ -d /etc/letsencrypt/live/${WIKI_DOMAIN_NAME} ]; then - ln -s /etc/letsencrypt/live/${WIKI_DOMAIN_NAME}/privkey.pem /etc/ssl/private/${WIKI_DOMAIN_NAME}.key - ln -s /etc/letsencrypt/live/${WIKI_DOMAIN_NAME}/fullchain.pem /etc/ssl/certs/${WIKI_DOMAIN_NAME}.pem - fi + echo $"Restoring Wiki installation ${WIKI_DOMAIN_NAME}" + restore_directory_from_usb /root/tempwiki wiki + cp -r /root/tempwiki/var/lib/dokuwiki/* /var/lib/dokuwiki/ + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + exit 868 + fi + restore_directory_from_usb /root/tempwiki2 wiki2 + cp -r /root/tempwiki2/etc/dokuwiki/* /etc/dokuwiki/ + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + exit 869 + fi + rm -rf /root/tempwiki + rm -rf /root/tempwiki2 + chown -R www-data:www-data /var/lib/dokuwiki/* + # Ensure that the bundled SSL cert is being used + if [ -f /etc/ssl/certs/${WIKI_DOMAIN_NAME}.bundle.crt ]; then + sed -i "s|${WIKI_DOMAIN_NAME}.crt|${WIKI_DOMAIN_NAME}.bundle.crt|g" /etc/nginx/sites-available/${WIKI_DOMAIN_NAME} + fi + if [ -d /etc/letsencrypt/live/${WIKI_DOMAIN_NAME} ]; then + ln -s /etc/letsencrypt/live/${WIKI_DOMAIN_NAME}/privkey.pem /etc/ssl/private/${WIKI_DOMAIN_NAME}.key + ln -s /etc/letsencrypt/live/${WIKI_DOMAIN_NAME}/fullchain.pem /etc/ssl/certs/${WIKI_DOMAIN_NAME}.pem + fi fi if [ -d $USB_MOUNT/backup/blog ]; then FULLBLOG_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Blog domain" | awk -F ':' '{print $2}') - echo $"Restoring blog installation" - restore_directory_from_usb /root/tempblog blog - rm -rf /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs - cp -r /root/tempblog/var/www/${FULLBLOG_DOMAIN_NAME}/htdocs /var/www/${FULLBLOG_DOMAIN_NAME}/ - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - exit 593 - fi - rm -rf /root/tempblog - if [ ! -d /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content ]; then - echo $"No content directory found after restoring blog" - umount $USB_MOUNT - rm -rf $USB_MOUNT - exit 287 - fi - chown -R www-data:www-data /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs - # Ensure that the bundled SSL cert is being used - if [ -f /etc/ssl/certs/${FULLBLOG_DOMAIN_NAME}.bundle.crt ]; then - sed -i "s|${FULLBLOG_DOMAIN_NAME}.crt|${FULLBLOG_DOMAIN_NAME}.bundle.crt|g" /etc/nginx/sites-available/${FULLBLOG_DOMAIN_NAME} - fi - for d in /home/*/ ; do - USERNAME=$(echo "$d" | awk -F '/' '{print $3}') - if [[ $USERNAME != "git" ]]; then - if [ -d /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post ]; then - mv /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/*.md /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post - fi - fi - done - if [ -d /etc/letsencrypt/live/${FULLBLOG_DOMAIN_NAME} ]; then - ln -s /etc/letsencrypt/live/${FULLBLOG_DOMAIN_NAME}/privkey.pem /etc/ssl/private/${FULLBLOG_DOMAIN_NAME}.key - ln -s /etc/letsencrypt/live/${FULLBLOG_DOMAIN_NAME}/fullchain.pem /etc/ssl/certs/${FULLBLOG_DOMAIN_NAME}.pem - fi + echo $"Restoring blog installation" + restore_directory_from_usb /root/tempblog blog + rm -rf /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs + cp -r /root/tempblog/var/www/${FULLBLOG_DOMAIN_NAME}/htdocs /var/www/${FULLBLOG_DOMAIN_NAME}/ + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + exit 593 + fi + rm -rf /root/tempblog + if [ ! -d /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content ]; then + echo $"No content directory found after restoring blog" + umount $USB_MOUNT + rm -rf $USB_MOUNT + exit 287 + fi + chown -R www-data:www-data /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs + # Ensure that the bundled SSL cert is being used + if [ -f /etc/ssl/certs/${FULLBLOG_DOMAIN_NAME}.bundle.crt ]; then + sed -i "s|${FULLBLOG_DOMAIN_NAME}.crt|${FULLBLOG_DOMAIN_NAME}.bundle.crt|g" /etc/nginx/sites-available/${FULLBLOG_DOMAIN_NAME} + fi + for d in /home/*/ ; do + USERNAME=$(echo "$d" | awk -F '/' '{print $3}') + if [[ $USERNAME != "git" ]]; then + if [ -d /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post ]; then + mv /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/*.md /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post + fi + fi + done + if [ -d /etc/letsencrypt/live/${FULLBLOG_DOMAIN_NAME} ]; then + ln -s /etc/letsencrypt/live/${FULLBLOG_DOMAIN_NAME}/privkey.pem /etc/ssl/private/${FULLBLOG_DOMAIN_NAME}.key + ln -s /etc/letsencrypt/live/${FULLBLOG_DOMAIN_NAME}/fullchain.pem /etc/ssl/certs/${FULLBLOG_DOMAIN_NAME}.pem + fi fi if [ -d $USB_MOUNT/backup/cjdns ]; then - echo $"Restoring cjdns installation" - restore_directory_from_usb /root/tempcjdns cjdns - rm -rf /etc/cjdns - cp -r /root/tempcjdns/etc/cjdns /etc/ - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - exit 8472 - fi - rm -rf /root/tempcjdns + echo $"Restoring cjdns installation" + restore_directory_from_usb /root/tempcjdns cjdns + rm -rf /etc/cjdns + cp -r /root/tempcjdns/etc/cjdns /etc/ + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + exit 8472 + fi + rm -rf /root/tempcjdns fi if [ -d $USB_MOUNT/backup/mail ]; then - for d in $USB_MOUNT/backup/mail/*/ ; do - USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" ]]; then - if [ ! -d /home/$USERNAME ]; then - ${PROJECT_NAME}-adduser $USERNAME - fi - echo $"Restoring emails for $USERNAME" - restore_directory_from_usb /root/tempmail mail/$USERNAME - if [ ! -d /home/$USERNAME/Maildir ]; then - mkdir /home/$USERNAME/Maildir - fi - tar -xzvf /root/tempmail/root/tempbackupemail/$USERNAME/maildir.tar.gz -C / - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - exit 927 - fi - rm -rf /root/tempmail - fi - done + for d in $USB_MOUNT/backup/mail/*/ ; do + USERNAME=$(echo "$d" | awk -F '/' '{print $6}') + if [[ $USERNAME != "git" ]]; then + if [ ! -d /home/$USERNAME ]; then + ${PROJECT_NAME}-adduser $USERNAME + fi + echo $"Restoring emails for $USERNAME" + restore_directory_from_usb /root/tempmail mail/$USERNAME + if [ ! -d /home/$USERNAME/Maildir ]; then + mkdir /home/$USERNAME/Maildir + fi + tar -xzvf /root/tempmail/root/tempbackupemail/$USERNAME/maildir.tar.gz -C / + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + exit 927 + fi + rm -rf /root/tempmail + fi + done fi if [ -d /var/cache/minidlna ]; then - if [ -d $USB_MOUNT/backup/dlna ]; then - echo $"Restoring DLNA cache" - restore_directory_from_usb /root/tempdlna dlna - cp -r /root/tempdlna/var/cache/minidlna/* /var/cache/minidlna/ - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - exit 982 - fi - rm -rf /root/tempdlna - fi + if [ -d $USB_MOUNT/backup/dlna ]; then + echo $"Restoring DLNA cache" + restore_directory_from_usb /root/tempdlna dlna + cp -r /root/tempdlna/var/cache/minidlna/* /var/cache/minidlna/ + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + exit 982 + fi + rm -rf /root/tempdlna + fi fi if [ -d $USB_MOUNT/backup/voip ]; then - echo $"Restoring VoIP settings" - restore_directory_from_usb /root/tempvoip voip - cp -f /root/tempvoip/home/$ADMIN_USERNAME/tempbackup/mumble-server.ini /etc/ - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - rm -rf /root/tempvoip - exit 3679 - fi - cp -f /root/tempvoip/home/$ADMIN_USERNAME/tempbackup/sipwitch.conf /etc/sipwitch.conf - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - rm -rf /root/tempvoip - exit 3679 - fi - cp -f /root/tempvoip/home/$ADMIN_USERNAME/tempbackup/mumble-server.sqlite /var/lib/mumble-server/ - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - rm -rf /root/tempvoip - exit 276 - fi - rm -rf /root/tempvoip - cp /etc/ssl/certs/mumble* /var/lib/mumble-server - cp /etc/ssl/private/mumble* /var/lib/mumble-server - chown -R mumble-server:mumble-server /var/lib/mumble-server - service sipwitch restart - service mumble-server restart + echo $"Restoring VoIP settings" + restore_directory_from_usb /root/tempvoip voip + cp -f /root/tempvoip/home/$ADMIN_USERNAME/tempbackup/mumble-server.ini /etc/ + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + rm -rf /root/tempvoip + exit 3679 + fi + cp -f /root/tempvoip/home/$ADMIN_USERNAME/tempbackup/sipwitch.conf /etc/sipwitch.conf + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + rm -rf /root/tempvoip + exit 3679 + fi + cp -f /root/tempvoip/home/$ADMIN_USERNAME/tempbackup/mumble-server.sqlite /var/lib/mumble-server/ + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + rm -rf /root/tempvoip + exit 276 + fi + rm -rf /root/tempvoip + cp /etc/ssl/certs/mumble* /var/lib/mumble-server + cp /etc/ssl/private/mumble* /var/lib/mumble-server + chown -R mumble-server:mumble-server /var/lib/mumble-server + service sipwitch restart + service mumble-server restart fi if [ -d $USB_MOUNT/backup/tox ]; then - echo $"Restoring Tox node settings" - restore_directory_from_usb / tox - if [ ! "$?" = "0" ]; then - umount $USB_MOUNT - rm -rf $USB_MOUNT - exit 6393 - fi - cp /var/lib/tox-bootstrapd/tox-bootstrapd.conf /etc/tox-bootstrapd.conf - systemctl restart tox-bootstrapd.service - if [ ! "$?" = "0" ]; then - systemctl status tox-bootstrapd.service - umount $USB_MOUNT - rm -rf $USB_MOUNT - exit 59369 - fi + echo $"Restoring Tox node settings" + restore_directory_from_usb / tox + if [ ! "$?" = "0" ]; then + umount $USB_MOUNT + rm -rf $USB_MOUNT + exit 6393 + fi + cp /var/lib/tox-bootstrapd/tox-bootstrapd.conf /etc/tox-bootstrapd.conf + systemctl restart tox-bootstrapd.service + if [ ! "$?" = "0" ]; then + systemctl status tox-bootstrapd.service + umount $USB_MOUNT + rm -rf $USB_MOUNT + exit 59369 + fi fi sync @@ -717,18 +725,18 @@ 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 + 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 + echo $"Unmount encrypted USB" + cryptsetup luksClose encrypted_usb fi if [ -f /dev/mapper/encrypted_usb ]; then - rm -rf /dev/mapper/encrypted_usb + rm -rf /dev/mapper/encrypted_usb fi echo $"Restore from USB drive is complete. You can now remove it."