From 2b9df463b46268a1d76758e74c98b70fea0e37e0 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sat, 9 Jul 2016 10:28:53 +0100
Subject: [PATCH] Move syncthing local restore to app script
---
src/freedombone-app-syncthing | 79 ++++++++++++++++++++++++++++++++++
src/freedombone-restore-local | 80 -----------------------------------
2 files changed, 79 insertions(+), 80 deletions(-)
diff --git a/src/freedombone-app-syncthing b/src/freedombone-app-syncthing
index 5b3f5f762..157f502c7 100755
--- a/src/freedombone-app-syncthing
+++ b/src/freedombone-app-syncthing
@@ -55,10 +55,89 @@ function backup_local_syncthing {
fi
}
+function restore_local_syncthing {
+ if [ -f /etc/systemd/system/syncthing.service ]; then
+ systemctl stop syncthing
+ systemctl stop cron
+ fi
+
+ temp_restore_dir=/root/tempsyncthing
+ if [ -d $USB_MOUNT/backup/syncthingconfig ]; then
+ echo $"Restoring syncthing configuration"
+ function_check restore_directory_from_usb
+ restore_directory_from_usb ${temp_restore_dir}config syncthingconfig
+ cp -r ${temp_restore_dir}config/* /
+ if [ ! "$?" = "0" ]; then
+ set_user_permissions
+ backup_unmount_drive
+ systemctl start syncthing
+ systemctl start cron
+ exit 6833
+ fi
+ rm -rf ${temp_restore_dir}config
+ fi
+
+ if [ -d $USB_MOUNT/backup/syncthingshared ]; then
+ echo $"Restoring syncthing shared files"
+ restore_directory_from_usb ${temp_restore_dir}shared syncthingshared
+ cp -r ${temp_restore_dir}shared/* /
+ if [ ! "$?" = "0" ]; then
+ set_user_permissions
+ backup_unmount_drive
+ systemctl start syncthing
+ systemctl start cron
+ exit 37904
+ fi
+ rm -rf ${temp_restore_dir}shared
+ fi
+
+ if [ -d $USB_MOUNT/backup/syncthing ]; then
+ for d in $USB_MOUNT/backup/syncthing/*/ ; do
+ USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+ if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+ if [ ! -d /home/$USERNAME ]; then
+ ${PROJECT_NAME}-adduser $USERNAME
+ fi
+ echo $"Restoring syncthing files for $USERNAME"
+ restore_directory_from_usb ${temp_restore_dir} syncthing/$USERNAME
+ cp -r ${temp_restore_dir}/home/$USERNAME/Sync /home/$USERNAME/
+ if [ ! "$?" = "0" ]; then
+ rm -rf ${temp_restore_dir}
+ set_user_permissions
+ backup_unmount_drive
+ systemctl start syncthing
+ systemctl start cron
+ exit 68438
+ fi
+ rm -rf ${temp_restore_dir}
+
+ # restore device IDs from config settings
+ if [ -f /home/$USERNAME/.config/syncthing/.syncthing-server-id ]; then
+ cp /home/$USERNAME/.config/syncthing/.syncthing-server-id /home/$USERNAME/.syncthing-server-id
+ chown $USERNAME:$USERNAME /home/$USERNAME/.syncthing-server-id
+ fi
+ if [ -f /home/$USERNAME/.config/syncthing/.syncthingids ]; then
+ cp /home/$USERNAME/.config/syncthing/.syncthingids /home/$USERNAME/.syncthingids
+ chown $USERNAME:$USERNAME /home/$USERNAME/.syncthingids
+ fi
+ fi
+ done
+ fi
+
+ if [ -f /etc/systemd/system/syncthing.service ]; then
+ systemctl start syncthing
+ systemctl start cron
+ fi
+}
+
function backup_remote_syncthing {
echo -n ''
}
+function restore_remote_syncthing {
+ echo -n ''
+}
+
function remove_syncthing {
if ! grep -Fxq "install_syncthing" $COMPLETION_FILE; then
return
diff --git a/src/freedombone-restore-local b/src/freedombone-restore-local
index 7502173b4..104ef20fe 100755
--- a/src/freedombone-restore-local
+++ b/src/freedombone-restore-local
@@ -878,85 +878,6 @@ function restore_hubzilla {
fi
}
-function restore_syncthing {
- if [[ $RESTORE_APP != 'all' ]]; then
- if [[ $RESTORE_APP != 'syncthing' ]]; then
- return
- fi
- fi
-
- if [ -f /etc/systemd/system/syncthing.service ]; then
- systemctl stop syncthing
- systemctl stop cron
- fi
-
- if [ -d $USB_MOUNT/backup/syncthingconfig ]; then
- echo $"Restoring syncthing configuration"
- restore_directory_from_usb /root/tempsyncthingconfig syncthingconfig
- cp -r /root/tempsyncthingconfig/* /
- if [ ! "$?" = "0" ]; then
- set_user_permissions
- backup_unmount_drive
- systemctl start syncthing
- systemctl start cron
- exit 6833
- fi
- rm -rf /root/tempsyncthingconfig
- fi
-
- if [ -d $USB_MOUNT/backup/syncthingshared ]; then
- echo $"Restoring syncthing shared files"
- restore_directory_from_usb /root/tempsyncthingshared syncthingshared
- cp -r /root/tempsyncthingshared/* /
- if [ ! "$?" = "0" ]; then
- set_user_permissions
- backup_unmount_drive
- systemctl start syncthing
- systemctl start cron
- exit 37904
- fi
- rm -rf /root/tempsyncthingshared
- fi
-
- if [ -d $USB_MOUNT/backup/syncthing ]; then
- for d in $USB_MOUNT/backup/syncthing/*/ ; do
- USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
- if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
- if [ ! -d /home/$USERNAME ]; then
- ${PROJECT_NAME}-adduser $USERNAME
- fi
- echo $"Restoring syncthing files for $USERNAME"
- restore_directory_from_usb /root/tempsyncthing syncthing/$USERNAME
- cp -r /root/tempsyncthing/home/$USERNAME/Sync /home/$USERNAME/
- if [ ! "$?" = "0" ]; then
- rm -rf /root/tempsyncthing
- set_user_permissions
- backup_unmount_drive
- systemctl start syncthing
- systemctl start cron
- exit 68438
- fi
- rm -rf /root/tempsyncthing
-
- # restore device IDs from config settings
- if [ -f /home/$USERNAME/.config/syncthing/.syncthing-server-id ]; then
- cp /home/$USERNAME/.config/syncthing/.syncthing-server-id /home/$USERNAME/.syncthing-server-id
- chown $USERNAME:$USERNAME /home/$USERNAME/.syncthing-server-id
- fi
- if [ -f /home/$USERNAME/.config/syncthing/.syncthingids ]; then
- cp /home/$USERNAME/.config/syncthing/.syncthingids /home/$USERNAME/.syncthingids
- chown $USERNAME:$USERNAME /home/$USERNAME/.syncthingids
- fi
- fi
- done
- fi
-
- if [ -f /etc/systemd/system/syncthing.service ]; then
- systemctl start syncthing
- systemctl start cron
- fi
-}
-
function restore_email {
if [[ $RESTORE_APP != 'all' ]]; then
if [[ $RESTORE_APP != 'email' ]]; then
@@ -1049,7 +970,6 @@ restore_xmpp
restore_gnusocial
restore_hubzilla
restore_rss
-restore_syncthing
restore_email
restore_apps
--
GitLab