X-Git-Url: https://git.p6c8.net/nextcloud-backup-restore.git/blobdiff_plain/c0c07664edd370d5385dc1eb44174bed1e5ecbbe..371777ac913b6a7b3b499b7920629d927a1c590e:/NextcloudBackup.sh

diff --git a/NextcloudBackup.sh b/NextcloudBackup.sh
index 76ca676..e5614fb 100644
--- a/NextcloudBackup.sh
+++ b/NextcloudBackup.sh
@@ -3,7 +3,7 @@
 #
 # Bash script for creating backups of Nextcloud.
 #
-# Version 2.0.0
+# Version 2.1.3
 #
 # Usage:
 # 	- With backup directory specified in the script:  ./NextcloudBackup.sh
@@ -24,6 +24,8 @@ 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'
+else
+	backupMainDir=$(echo $backupMainDir | sed 's:/*$::')
 fi
 
 currentDate=$(date +"%Y%m%d_%H%M%S")
@@ -31,6 +33,12 @@ 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 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.
+useCompression=true
+
 # TODO: The directory of your Nextcloud installation (this is a directory under your web root)
 nextcloudFileDir='/var/www/nextcloud'
 
@@ -69,11 +77,20 @@ 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'
-fileNameBackupDataDir='nextcloud-datadir.tar.gz'
+fileNameBackupFileDir='nextcloud-filedir.tar'
+fileNameBackupDataDir='nextcloud-datadir.tar'
+
+if [ "$useCompression" = true ] ; then
+	fileNameBackupFileDir='nextcloud-filedir.tar.gz'
+	fileNameBackupDataDir='nextcloud-datadir.tar.gz'
+fi
 
 # TODO: Uncomment if you use local external storage
-#fileNameBackupExternalDataDir='nextcloud-external-datadir.tar.gz'
+#fileNameBackupExternalDataDir='nextcloud-external-datadir.tar'
+#
+#if [ "$useCompression" = true ] ; then
+#	fileNameBackupExternalDataDir='nextcloud-external-datadir.tar.gz'
+#fi
 
 fileNameBackupDb='nextcloud-db.sql'
 
@@ -81,7 +98,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
@@ -137,7 +154,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
@@ -145,7 +162,7 @@ echo
 #
 # Stop web server
 #
-echo "Stopping web server..."
+echo "$(date +"%H:%M:%S"): Stopping web server..."
 systemctl stop "${webserverServiceName}"
 echo "Done"
 echo
@@ -153,21 +170,36 @@ echo
 #
 # Backup file directory
 #
-echo "Creating backup of Nextcloud file directory..."
-tar -cpzf "${backupdir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}" .
+echo "$(date +"%H:%M:%S"): Creating backup of Nextcloud file directory..."
+
+if [ "$useCompression" = true ] ; then
+	tar -I pigz -cpf "${backupdir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}" .
+else
+	tar -cpf "${backupdir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}" .
+fi
+
 echo "Done"
 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"
-        tar -cpzf "${backupdir}/${fileNameBackupDataDir}"  --exclude="updater-*/backups/*" -C "${nextcloudDataDir}" .
+	echo "Ignoring updater backup directory"
+
+	if [ "$useCompression" = true ] ; then
+		tar -I pigz -cpf "${backupdir}/${fileNameBackupDataDir}"  --exclude="updater-*/backups/*" -C "${nextcloudDataDir}" .
+	else
+		tar -cpf "${backupdir}/${fileNameBackupDataDir}"  --exclude="updater-*/backups/*" -C "${nextcloudDataDir}" .
+	fi
 else
-        tar -cpzf "${backupdir}/${fileNameBackupDataDir}"  -C "${nextcloudDataDir}" .
+	if [ "$useCompression" = true ] ; then
+        tar -I pigz -cpf "${backupdir}/${fileNameBackupDataDir}"  -C "${nextcloudDataDir}" .
+	else
+		tar -cpf "${backupdir}/${fileNameBackupDataDir}"  -C "${nextcloudDataDir}" .
+	fi
 fi
 
 echo "Done"
@@ -175,8 +207,14 @@ echo
 
 # Backup local external storage.
 # Uncomment if you use local external storage
-#echo "Creating backup of Nextcloud local external storage directory..."
-#tar -cpzf "${backupdir}/${fileNameBackupExternalDataDir}"  -C "${nextcloudLocalExternalDataDir}" .
+#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
 
@@ -184,7 +222,7 @@ echo
 # 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)."
@@ -195,8 +233,8 @@ if [ "${databaseSystem,,}" = "mysql" ] || [ "${databaseSystem,,}" = "mariadb" ];
 
 	echo "Done"
 	echo
-elif [ "${databaseSystem,,}" = "postgresql" ]; then
-	echo "Backup Nextcloud database (PostgreSQL)..."
+elif [ "${databaseSystem,,}" = "postgresql" ] || [ "${databaseSystem,,}" = "pgsql" ]; then
+	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)."
@@ -212,7 +250,7 @@ fi
 #
 # Start web server
 #
-echo "Starting web server..."
+echo "$(date +"%H:%M:%S"): Starting web server..."
 systemctl start "${webserverServiceName}"
 echo "Done"
 echo
@@ -229,9 +267,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:?}"
@@ -243,4 +281,4 @@ fi
 
 echo
 echo "DONE!"
-echo "Backup created: ${backupdir}"
+echo "$(date +"%H:%M:%S"): Backup created: ${backupdir}"