When backup is cancelled, restart the webserver

[nextcloud-backup-restore.git] / NextcloudBackup.sh

diff --git a/NextcloudBackup.sh b/NextcloudBackup.sh
index 6781eafc947a265569a203bb59f32a6921f211a9..72bc4a08c398e4e9be7a1079535cd42fa53d49a8 100644 (file)
--- a/NextcloudBackup.sh
+++ b/NextcloudBackup.sh
@@ -3,7 +3,7 @@
 #
 # Bash script for creating backups of Nextcloud.
 #
-# Version 1.0.0
+# Version 1.1.1
 #
 # Usage:
 #      - With backup directory specified in the script:  ./NextcloudBackup.sh
@@ -26,8 +26,6 @@ if [ -z "$backupMainDir" ]; then
     backupMainDir='/media/hdd/nextcloud_backup'
 fi
 
-echo "Backup directory: $backupMainDir"
-
 currentDate=$(date +"%Y%m%d_%H%M%S")
 
 # The actual directory of the current backup - this is a subdirectory of the main directory above with a timestamp
@@ -65,6 +63,10 @@ dbPassword='mYpAsSw0rd'
 # TODO: The maximum number of backups to keep (when set to 0, all backups are kept)
 maxNrOfBackups=0
 
+# TODO: Ignore updater's backup directory in the data directory to safe space
+# Set to true to ignore the backup directory
+ignoreUpdaterBackups=false
+
 # File names for backup files
 # If you prefer other file names, you'll also have to change the NextcloudRestore.sh script.
 fileNameBackupFileDir='nextcloud-filedir.tar.gz'
@@ -99,9 +101,19 @@ function CtrlC() {
                echo "Maintenance mode still enabled."
        fi
 
+       echo "Starting web server..."
+       systemctl start "${webserverServiceName}"
+       echo "Done"
+       echo
+
        exit 1
 }
 
+#
+# Print information
+#
+echo "Backup directory: ${backupMainDir}"
+
 #
 # Check for root
 #
@@ -150,7 +162,14 @@ echo
 # Backup data directory
 #
 echo "Creating backup of Nextcloud data directory..."
-tar -cpzf "${backupdir}/${fileNameBackupDataDir}"  -C "${nextcloudDataDir}" .
+
+if [ "$ignoreUpdaterBackups" = true ] ; then
+        echo "Ignoring updater backup directory"
+        tar -cpzf "${backupdir}/${fileNameBackupDataDir}"  --exclude="updater-*/backups/*" -C "${nextcloudDataDir}" .
+else
+        tar -cpzf "${backupdir}/${fileNameBackupDataDir}"  -C "${nextcloudDataDir}" .
+fi
+
 echo "Done"
 echo
 
@@ -224,4 +243,4 @@ fi
 
 echo
 echo "DONE!"
-echo "Backup created: ${backupdir}"
\ No newline at end of file
+echo "Backup created: ${backupdir}"