From 802358b9a24fe581dc9c8323583f853743635496 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 29 Dec 2015 17:41:22 +0000 Subject: [PATCH] Backup and restore Tor settings --- src/freedombone-backup-local | 1 + src/freedombone-backup-remote | 8 ++++++++ src/freedombone-restore-local | 13 +++++++++++++ src/freedombone-restore-remote | 12 ++++++++++++ 4 files changed, 34 insertions(+) diff --git a/src/freedombone-backup-local b/src/freedombone-backup-local index 5ced2e9d..72ce06f0 100755 --- a/src/freedombone-backup-local +++ b/src/freedombone-backup-local @@ -359,6 +359,7 @@ function backup_directories { "/var/www/${HUBZILLA_DOMAIN_NAME}, hubzilla, /root/temphubzilladata, hubzilladata" "none, none, /var/www/${HUBZILLA_DOMAIN_NAME}/htdocs, hubzilla" "none, none, /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs, blog" + "none, none, /var/lib/tor, tor" ) for dr in "${backup_dirs[@]}" diff --git a/src/freedombone-backup-remote b/src/freedombone-backup-remote index 9a66a81b..fbbd2e6a 100755 --- a/src/freedombone-backup-remote +++ b/src/freedombone-backup-remote @@ -254,6 +254,13 @@ function backup_letsencrypt { fi } +function backup_tor { + if [ -d /etc/letsencrypt ]; then + echo $"Backing up Tor settings" + backup_directory_to_friend /var/lib/tor tor + fi +} + function backup_gnusocial { if grep -q "GNU Social domain" $COMPLETION_FILE; then MICROBLOG_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "GNU Social domain" | awk -F ':' '{print $2}') @@ -557,6 +564,7 @@ backup_configuration if [[ $TEST_MODE == "no" ]]; then backup_users backup_letsencrypt + backup_tor backup_gnusocial backup_hubzilla backup_owncloud diff --git a/src/freedombone-restore-local b/src/freedombone-restore-local index 77e076a6..1a8b97dc 100755 --- a/src/freedombone-restore-local +++ b/src/freedombone-restore-local @@ -335,6 +335,18 @@ function restore_letsencrypt { fi } +function restore_tor { + if [[ $RESTORE_APP != 'all' ]]; then + if [[ $RESTORE_APP != 'tor' ]]; then + return + fi + fi + if [ -d $USB_MOUNT/backup/tor ]; then + echo $"Restoring Tor settings" + restore_directory_from_usb / tor + fi +} + function restore_mutt_settings { if [[ $RESTORE_APP != 'all' ]]; then if [[ $RESTORE_APP != 'mutt' ]]; then @@ -977,6 +989,7 @@ same_admin_user update_domains restore_mariadb restore_letsencrypt +restore_tor restore_mutt_settings restore_gpg restore_procmail diff --git a/src/freedombone-restore-remote b/src/freedombone-restore-remote index c5e4b60c..26080e0c 100755 --- a/src/freedombone-restore-remote +++ b/src/freedombone-restore-remote @@ -240,6 +240,18 @@ function restore_letsencrypt { fi } +function restore_tor { + if [[ $RESTORE_APP != 'all' ]]; then + if [[ $RESTORE_APP != 'tor' ]]; then + return + fi + fi + if [ -d $SERVER_DIRECTORY/backup/tor ]; then + echo $"Restoring Tor settings" + restore_directory_from_friend / tor + fi +} + function restore_mutt_settings { if [[ $RESTORE_APP != 'all' ]]; then if [[ $RESTORE_APP != 'mutt' ]]; then