X-Git-Url: https://git.p6c8.net/nextcloud-backup-restore.git/blobdiff_plain/3ba26cfe9a8d11e874cd2a9c2e042fc9bc4dd2aa..dd79fe9d4d89653f8fa1898ebd0df46736b104fc:/NextcloudBackup.sh?ds=inline

diff --git a/NextcloudBackup.sh b/NextcloudBackup.sh
index 0b03af1..1e5dd9c 100644
--- a/NextcloudBackup.sh
+++ b/NextcloudBackup.sh
@@ -3,7 +3,7 @@
 #
 # Bash script for creating backups of Nextcloud.
 #
-# Version 2.1.0
+# Version 2.1.3
 #
 # Usage:
 # 	- With backup directory specified in the script:  ./NextcloudBackup.sh
@@ -23,7 +23,9 @@ backupMainDir=$1
 
 if [ -z "$backupMainDir" ]; then
 	# TODO: The directory where you store the Nextcloud backups (when not specified by args)
-    backupMainDir='/media/hdd/nextcloud_backup'
+	backupMainDir='/media/hdd/nextcloud_backup'
+else
+	backupMainDir=$(echo $backupMainDir | sed 's:/*$::')
 fi
 
 currentDate=$(date +"%Y%m%d_%H%M%S")
@@ -31,7 +33,7 @@ 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
 backupdir="${backupMainDir}/${currentDate}/"
 
-# TODO: Use compression for Matrix Synapse installation/lib dir
+# TODO: Use compression for file/data dir
 # When this is the only script for backups, it's recommend to enable compression.
 # If the output of this script is used in another (compressing) backup (e.g. borg backup), 
 # you should probably disable compression here and only enable compression of your main backup script.
@@ -83,12 +85,15 @@ if [ "$useCompression" = true ] ; then
 	fileNameBackupDataDir='nextcloud-datadir.tar.gz'
 fi
 
-# TODO: Uncomment if you use local external storage
-#fileNameBackupExternalDataDir='nextcloud-external-datadir.tar'
-#
-#if [ "$useCompression" = true ] ; then
-#	fileNameBackupExternalDataDir='nextcloud-external-datadir.tar.gz'
-#fi
+fileNameBackupExternalDataDir=''
+
+if [ ! -z "${nextcloudLocalExternalDataDir+x}" ] ; then
+	fileNameBackupExternalDataDir='nextcloud-external-datadir.tar'
+
+	if [ "$useCompression" = true ] ; then
+		fileNameBackupExternalDataDir='nextcloud-external-datadir.tar.gz'
+	fi
+fi
 
 fileNameBackupDb='nextcloud-db.sql'
 
@@ -96,7 +101,7 @@ fileNameBackupDb='nextcloud-db.sql'
 errorecho() { cat <<< "$@" 1>&2; }
 
 function DisableMaintenanceMode() {
-	echo "Switching off maintenance mode..."
+	echo "$(date +"%H:%M:%S"): Switching off maintenance mode..."
 	sudo -u "${webserverUser}" php ${nextcloudFileDir}/occ maintenance:mode --off
 	echo "Done"
 	echo
@@ -152,7 +157,7 @@ fi
 #
 # Set maintenance mode
 #
-echo "Set maintenance mode for Nextcloud..."
+echo "$(date +"%H:%M:%S"): Set maintenance mode for Nextcloud..."
 sudo -u "${webserverUser}" php ${nextcloudFileDir}/occ maintenance:mode --on
 echo "Done"
 echo
@@ -160,7 +165,7 @@ echo
 #
 # Stop web server
 #
-echo "Stopping web server..."
+echo "$(date +"%H:%M:%S"): Stopping web server..."
 systemctl stop "${webserverServiceName}"
 echo "Done"
 echo
@@ -168,10 +173,10 @@ echo
 #
 # Backup file directory
 #
-echo "Creating backup of Nextcloud file directory..."
+echo "$(date +"%H:%M:%S"): Creating backup of Nextcloud file directory..."
 
 if [ "$useCompression" = true ] ; then
-	tar -cpzf "${backupdir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}" .
+	tar -I pigz -cpf "${backupdir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}" .
 else
 	tar -cpf "${backupdir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}" .
 fi
@@ -182,19 +187,19 @@ echo
 #
 # Backup data directory
 #
-echo "Creating backup of Nextcloud data directory..."
+echo "$(date +"%H:%M:%S"): Creating backup of Nextcloud data directory..."
 
 if [ "$ignoreUpdaterBackups" = true ] ; then
 	echo "Ignoring updater backup directory"
 
 	if [ "$useCompression" = true ] ; then
-		tar -cpzf "${backupdir}/${fileNameBackupDataDir}"  --exclude="updater-*/backups/*" -C "${nextcloudDataDir}" .
+		tar -I pigz -cpf "${backupdir}/${fileNameBackupDataDir}"  --exclude="updater-*/backups/*" -C "${nextcloudDataDir}" .
 	else
 		tar -cpf "${backupdir}/${fileNameBackupDataDir}"  --exclude="updater-*/backups/*" -C "${nextcloudDataDir}" .
 	fi
 else
 	if [ "$useCompression" = true ] ; then
-        tar -cpzf "${backupdir}/${fileNameBackupDataDir}"  -C "${nextcloudDataDir}" .
+        tar -I pigz -cpf "${backupdir}/${fileNameBackupDataDir}"  -C "${nextcloudDataDir}" .
 	else
 		tar -cpf "${backupdir}/${fileNameBackupDataDir}"  -C "${nextcloudDataDir}" .
 	fi
@@ -203,23 +208,27 @@ fi
 echo "Done"
 echo
 
+#
 # Backup local external storage.
-# Uncomment if you use local external storage
-#echo "Creating backup of Nextcloud local external storage directory..."
-#if [ "$useCompression" = true ] ; then
-#	tar -cpzf "${backupdir}/${fileNameBackupExternalDataDir}"  -C "${nextcloudLocalExternalDataDir}" .
-#else
-#	tar -cpf "${backupdir}/${fileNameBackupExternalDataDir}"  -C "${nextcloudLocalExternalDataDir}" .
-#fi
+#
+if [ ! -z "${nextcloudLocalExternalDataDir+x}" ] ; then
+	echo "$(date +"%H:%M:%S"): Creating backup of Nextcloud local external storage directory..."
+
+	if [ "$useCompression" = true ] ; then
+		tar -I pigz -cpf "${backupdir}/${fileNameBackupExternalDataDir}"  -C "${nextcloudLocalExternalDataDir}" .
+	else
+		tar -cpf "${backupdir}/${fileNameBackupExternalDataDir}"  -C "${nextcloudLocalExternalDataDir}" .
+	fi
 
-#echo "Done"
-#echo
+	echo "Done"
+	echo
+fi
 
 #
 # Backup DB
 #
 if [ "${databaseSystem,,}" = "mysql" ] || [ "${databaseSystem,,}" = "mariadb" ]; then
-  	echo "Backup Nextcloud database (MySQL/MariaDB)..."
+  	echo "$(date +"%H:%M:%S"): Backup Nextcloud database (MySQL/MariaDB)..."
 
 	if ! [ -x "$(command -v mysqldump)" ]; then
 		errorecho "ERROR: MySQL/MariaDB not installed (command mysqldump not found)."
@@ -231,7 +240,7 @@ if [ "${databaseSystem,,}" = "mysql" ] || [ "${databaseSystem,,}" = "mariadb" ];
 	echo "Done"
 	echo
 elif [ "${databaseSystem,,}" = "postgresql" ] || [ "${databaseSystem,,}" = "pgsql" ]; then
-	echo "Backup Nextcloud database (PostgreSQL)..."
+	echo "$(date +"%H:%M:%S"): Backup Nextcloud database (PostgreSQL)..."
 
 	if ! [ -x "$(command -v pg_dump)" ]; then
 		errorecho "ERROR: PostgreSQL not installed (command pg_dump not found)."
@@ -247,7 +256,7 @@ fi
 #
 # Start web server
 #
-echo "Starting web server..."
+echo "$(date +"%H:%M:%S"): Starting web server..."
 systemctl start "${webserverServiceName}"
 echo "Done"
 echo
@@ -264,9 +273,9 @@ if [ ${maxNrOfBackups} != 0 ]
 then
 	nrOfBackups=$(ls -l ${backupMainDir} | grep -c ^d)
 
-	if [[ ${nrOfBackups} > ${maxNrOfBackups} ]]
+	if [ ${nrOfBackups} -gt ${maxNrOfBackups} ]
 	then
-		echo "Removing old backups..."
+		echo "$(date +"%H:%M:%S"): Removing old backups..."
 		ls -t ${backupMainDir} | tail -$(( nrOfBackups - maxNrOfBackups )) | while read -r dirToRemove; do
 			echo "${dirToRemove}"
 			rm -r "${backupMainDir}/${dirToRemove:?}"
@@ -278,4 +287,4 @@ fi
 
 echo
 echo "DONE!"
-echo "Backup created: ${backupdir}"
+echo "$(date +"%H:%M:%S"): Backup created: ${backupdir}"