From 1ee0529aabe3f2f36c6ebb92058835afcbfed30d Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Tue, 1 Nov 2016 19:22:19 +0000
Subject: [PATCH] Extraneous backup messages
---
src/freedombone-app-dlna | 4 ----
src/freedombone-app-dokuwiki | 4 ----
src/freedombone-app-gnusocial | 4 ----
src/freedombone-app-htmly | 4 ----
src/freedombone-app-ipfs | 4 ----
src/freedombone-app-syncthing | 4 ----
src/freedombone-app-tahoelafs | 4 ----
src/freedombone-app-xmpp | 4 ----
8 files changed, 32 deletions(-)
diff --git a/src/freedombone-app-dlna b/src/freedombone-app-dlna
index f3d16d960..ed08d1f31 100755
--- a/src/freedombone-app-dlna
+++ b/src/freedombone-app-dlna
@@ -97,12 +97,8 @@ function backup_local_dlna {
source_directory=/var/cache/minidlna
if [ -d $source_directory ]; then
dest_directory=dlna
- echo $"Backing up $source_directory to $dest_directory"
-
function_check backup_directory_to_usb
backup_directory_to_usb $source_directory $dest_directory
-
- echo $"Backup to $dest_directory complete"
fi
}
diff --git a/src/freedombone-app-dokuwiki b/src/freedombone-app-dokuwiki
index d75948f08..c0deeb63b 100755
--- a/src/freedombone-app-dokuwiki
+++ b/src/freedombone-app-dokuwiki
@@ -76,13 +76,9 @@ function backup_local_dokuwiki {
source_directory=/var/lib/dokuwiki
if [ -d $source_directory ]; then
dest_directory=dokuwiki
- echo $"Backing up $source_directory to $dest_directory"
-
function_check backup_directory_to_usb
backup_directory_to_usb $source_directory $dest_directory
backup_directory_to_usb /etc/dokuwiki dokuwiki2
-
- echo $"Backup to $dest_directory complete"
fi
}
diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial
index c1476601e..01dcdd90c 100755
--- a/src/freedombone-app-gnusocial
+++ b/src/freedombone-app-gnusocial
@@ -366,8 +366,6 @@ function backup_local_gnusocial {
source_directory=/var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs
if [ -d $source_directory ]; then
dest_directory=gnusocial
- echo $"Backing up $source_directory to $dest_directory"
-
function_check suspend_site
suspend_site ${GNUSOCIAL_DOMAIN_NAME}
@@ -379,8 +377,6 @@ function backup_local_gnusocial {
function_check restart_site
restart_site
-
- echo $"Backup to $dest_directory complete"
fi
}
diff --git a/src/freedombone-app-htmly b/src/freedombone-app-htmly
index 2bb6ccc14..8427a0265 100755
--- a/src/freedombone-app-htmly
+++ b/src/freedombone-app-htmly
@@ -203,8 +203,6 @@ function backup_local_htmly {
source_directory=/var/www/${HTMLY_DOMAIN_NAME}/htdocs
if [ -d $source_directory ]; then
dest_directory=htmly
- echo $"Backing up $source_directory to $dest_directory"
-
function_check suspend_site
suspend_site ${HTMLY_DOMAIN_NAME}
@@ -213,8 +211,6 @@ function backup_local_htmly {
function_check restart_site
restart_site
-
- echo $"Backup to $dest_directory complete"
fi
}
diff --git a/src/freedombone-app-ipfs b/src/freedombone-app-ipfs
index c21bac124..c07b70feb 100755
--- a/src/freedombone-app-ipfs
+++ b/src/freedombone-app-ipfs
@@ -95,12 +95,8 @@ function backup_local_ipfs {
source_directory=/home/$ADMIN_USERNAME/.ipfs
if [ -d $source_directory ]; then
dest_directory=ipfs
- echo $"Backing up $source_directory to $dest_directory"
-
function_check backup_directory_to_usb
backup_directory_to_usb $source_directory $dest_directory
-
- echo $"Backup to $dest_directory complete"
fi
}
diff --git a/src/freedombone-app-syncthing b/src/freedombone-app-syncthing
index 64b296308..66db9f1a9 100755
--- a/src/freedombone-app-syncthing
+++ b/src/freedombone-app-syncthing
@@ -241,13 +241,9 @@ function upgrade_syncthing {
function backup_local_syncthing {
if [ -d /var/lib/syncthing/SyncShared ]; then
- echo $"Backing up syncthing"
-
function_check backup_directory_to_usb
backup_directory_to_usb /var/lib/syncthing/SyncShared syncthingshared
backup_directory_to_usb /root/.config/syncthing syncthingconfig
-
- echo $"Backup to syncthing complete"
fi
for d in /home/*/ ; do
diff --git a/src/freedombone-app-tahoelafs b/src/freedombone-app-tahoelafs
index e05b60c36..234a05beb 100755
--- a/src/freedombone-app-tahoelafs
+++ b/src/freedombone-app-tahoelafs
@@ -128,13 +128,11 @@ function backup_local_tahoelafs {
if [ ! -d $source_directory ]; then
return
fi
- echo $"Backing up Tahoe-LAFS introducer"
systemctl stop tahoelafs
dest_directory=tahoelafs
function_check backup_directory_to_usb
backup_directory_to_usb $source_directory $dest_directory
systemctl start tahoelafs
- echo $"Backup to $dest_directory complete"
}
function restore_local_tahoelafs {
@@ -159,13 +157,11 @@ function backup_remote_tahoelafs {
if [ ! -d $source_directory ]; then
return
fi
- echo $"Backing up Tahoe-LAFS introducer"
systemctl stop tahoelafs
dest_directory=tahoelafs
function_check backup_directory_to_usb
backup_directory_to_friend $source_directory $dest_directory
systemctl start tahoelafs
- echo $"Backup to $dest_directory complete"
}
function restore_remote_tahoelafs {
diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index d46ecd739..588ce2e91 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -183,12 +183,8 @@ function backup_local_xmpp {
source_directory=/var/lib/prosody xmpp
if [ -d $source_directory ]; then
dest_directory=xmpp
- echo $"Backing up $source_directory to $dest_directory"
-
function_check backup_directory_to_usb
backup_directory_to_usb $source_directory $dest_directory
-
- echo $"Backup to $dest_directory complete"
fi
}
--
GitLab