From c2f56cd1ecbb82275f1beda4c3d57be2784a7008 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 9 Jul 2016 21:34:21 +0100 Subject: [PATCH] Move remote xmpp backup to app script --- src/freedombone-app-xmpp | 8 ++++++-- src/freedombone-backup-remote | 8 -------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp index 12d5be38..15c0ba5d 100755 --- a/src/freedombone-app-xmpp +++ b/src/freedombone-app-xmpp @@ -38,7 +38,7 @@ XMPP_CIPHERS='"EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA256:EECDH:+ XMPP_ECC_CURVE='"secp384r1"' function reconfigure_xmpp { - echo -n '' + echo -n '' } function update_prosody_modules { @@ -142,7 +142,11 @@ function restore_local_xmpp { } function backup_remote_xmpp { - echo -n '' + if [ -d /var/lib/prosody ]; then + echo $"Backing up the XMPP settings" + backup_directory_to_friend /var/lib/prosody xmpp + echo $"Backup of XMPP settings complete" + fi } function restore_remote_xmpp { diff --git a/src/freedombone-backup-remote b/src/freedombone-backup-remote index db2f0d45..629299db 100755 --- a/src/freedombone-backup-remote +++ b/src/freedombone-backup-remote @@ -258,13 +258,6 @@ function backup_mailing_list { fi } -function backup_xmpp { - if [ -d /var/lib/prosody ]; then - echo $"Backing up the XMPP settings" - backup_directory_to_friend /var/lib/prosody xmpp - fi -} - function backup_web_server { if [ -d /etc/nginx ]; then echo $"Backing up web settings" @@ -470,7 +463,6 @@ if [[ $TEST_MODE == "no" ]]; then backup_certs backup_mailing_list - backup_xmpp backup_ipfs backup_dlna backup_voip