X-Git-Url: https://git.p6c8.net/nextcloud-backup-restore.git/blobdiff_plain/ebbaec440e602a0f9bf3ac0f4ab1bec7ce91d609..b7782c102d4dfa0150444dfe5aab832056926d04:/NextcloudRestore.sh?ds=inline

diff --git a/NextcloudRestore.sh b/NextcloudRestore.sh
index a94c93b..51581be 100644
--- a/NextcloudRestore.sh
+++ b/NextcloudRestore.sh
@@ -3,7 +3,7 @@
 #
 # Bash script for restoring backups of Nextcloud.
 #
-# Version 1.0.0
+# Version 2.1.0
 #
 # Usage:
 #   - With backup directory specified in the script: ./NextcloudRestore.sh <BackupName> (e.g. ./NextcloudRestore.sh 20170910_132703)
@@ -29,6 +29,9 @@ fi
 
 echo "Backup directory: $backupMainDir"
 
+# TODO: Set this to true, if the backup was created with compression enabled, otherwiese false.
+useCompression=true
+
 currentRestoreDir="${backupMainDir}/${restore}"
 
 # TODO: The directory of your Nextcloud installation (this is a directory under your web root)
@@ -48,7 +51,7 @@ webserverServiceName='nginx'
 # TODO: Your web server user
 webserverUser='www-data'
 
-# TODO: The name of the database system (ome of: mysql, mariadb, postgresql)
+# TODO: The name of the database system (one of: mysql, mariadb, postgresql)
 databaseSystem='mariadb'
 
 # TODO: Your Nextcloud database name
@@ -62,11 +65,20 @@ dbPassword='mYpAsSw0rd'
 
 # File names for backup files
 # If you prefer other file names, you'll also have to change the NextcloudBackup.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
 
-# TOOD: Uncomment if you use local external storage
-#fileNameBackupExternalDataDir='nextcloud-external-datadir.tar.gz'
+# TODO: Uncomment if you use local external storage
+#fileNameBackupExternalDataDir='nextcloud-external-datadir.tar'
+#
+#if [ "$useCompression" = true ] ; then
+#    fileNameBackupExternalDataDir='nextcloud-external-datadir.tar.gz'
+#fi
 
 fileNameBackupDb='nextcloud-db.sql'
 
@@ -111,7 +123,7 @@ if [ "${databaseSystem,,}" = "mysql" ] || [ "${databaseSystem,,}" = "mariadb" ];
         errorecho "Cancel restore"
         exit 1
     fi
-elif [ "${databaseSystem,,}" = "postgresql" ]; then
+elif [ "${databaseSystem,,}" = "postgresql" ] || [ "${databaseSystem,,}" = "pgsql" ]; then
     if ! [ -x "$(command -v psql)" ]; then
 		errorecho "ERROR: PostgreSQL not installed (command psql not found)."
 		errorecho "ERROR: No restore of database possible!"
@@ -155,7 +167,7 @@ echo "Done"
 echo
 
 # Local external storage
-# TOOD: Uncomment if you use local external storage
+# TODO: Uncomment if you use local external storage
 #echo "Deleting old Nextcloud local external storage directory..."
 #rm -r "${nextcloudLocalExternalDataDir}"
 #mkdir -p "${nextcloudLocalExternalDataDir}"
@@ -168,20 +180,38 @@ echo
 
 # File directory
 echo "Restoring Nextcloud file directory..."
-tar -xmpzf "${currentRestoreDir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}"
+
+if [ "$useCompression" = true ] ; then
+    tar -xmpzf "${currentRestoreDir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}"
+else
+    tar -xmpf "${currentRestoreDir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}"
+fi
+
 echo "Done"
 echo
 
 # Data directory
 echo "Restoring Nextcloud data directory..."
-tar -xmpzf "${currentRestoreDir}/${fileNameBackupDataDir}" -C "${nextcloudDataDir}"
+
+if [ "$useCompression" = true ] ; then
+    tar -xmpzf "${currentRestoreDir}/${fileNameBackupDataDir}" -C "${nextcloudDataDir}"
+else
+    tar -xmpf "${currentRestoreDir}/${fileNameBackupDataDir}" -C "${nextcloudDataDir}"
+fi
+
 echo "Done"
 echo
 
 # Local external storage
-# TOOD: Uncomment if you use local external storage
+# TODO: Uncomment if you use local external storage
 #echo "Restoring Nextcloud data directory..."
-#tar -xmpzf "${currentRestoreDir}/${fileNameBackupExternalDataDir}" -C "${nextcloudLocalExternalDataDir}"
+#
+#if [ "$useCompression" = true ] ; then
+#    tar -xmpzf "${currentRestoreDir}/${fileNameBackupExternalDataDir}" -C "${nextcloudLocalExternalDataDir}"
+#else
+#    tar -xmpf "${currentRestoreDir}/${fileNameBackupExternalDataDir}" -C "${nextcloudLocalExternalDataDir}"
+#fi
+#
 #echo "Done"
 #echo
 
@@ -206,7 +236,7 @@ if [ "${databaseSystem,,}" = "mysql" ] || [ "${databaseSystem,,}" = "mariadb" ];
     mysql -h localhost -u "${dbUser}" -p"${dbPassword}" -e "CREATE DATABASE ${nextcloudDatabase} CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci"
     # TODO: Use this if the database from the backup DOES NOT use UTF8 with multibyte support (e.g. for emoijs in filenames):
     #mysql -h localhost -u "${dbUser}" -p"${dbPassword}" -e "CREATE DATABASE ${nextcloudDatabase}"
-elif [ "${databaseSystem,,}" = "postgresql" ]; then
+elif [ "${databaseSystem,,}" = "postgresql" ] || [ "${databaseSystem,,}" = "pgsql" ]; then
     sudo -u postgres psql -c "CREATE DATABASE ${nextcloudDatabase} WITH OWNER ${dbUser} TEMPLATE template0 ENCODING \"UTF8\";"
 fi
 
@@ -217,7 +247,7 @@ echo "Restoring backup DB..."
 
 if [ "${databaseSystem,,}" = "mysql" ] || [ "${databaseSystem,,}" = "mariadb" ]; then
 	mysql -h localhost -u "${dbUser}" -p"${dbPassword}" "${nextcloudDatabase}" < "${currentRestoreDir}/${fileNameBackupDb}"
-elif [ "${databaseSystem,,}" = "postgresql" ]; then
+elif [ "${databaseSystem,,}" = "postgresql" ] || [ "${databaseSystem,,}" = "pgsql" ]; then
 	sudo -u postgres psql "${nextcloudDatabase}" < "${currentRestoreDir}/${fileNameBackupDb}"
 fi
 
@@ -238,13 +268,13 @@ echo
 echo "Setting directory permissions..."
 chown -R "${webserverUser}":"${webserverUser}" "${nextcloudFileDir}"
 chown -R "${webserverUser}":"${webserverUser}" "${nextcloudDataDir}"
-# TOOD: Uncomment if you use local external storage
+# TODO: Uncomment if you use local external storage
 #chown -R "${webserverUser}":"${webserverUser}" "${nextcloudLocalExternalDataDir}"
 echo "Done"
 echo
 
 #
-# Update the system data-fingerprint (see https://docs.nextcloud.com/server/16/admin_manual/configuration_server/occ_command.html#maintenance-commands-label)
+# Update the system data-fingerprint (see https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html#maintenance-commands-label)
 #
 echo "Updating the system data-fingerprint..."
 sudo -u "${webserverUser}" php ${nextcloudFileDir}/occ maintenance:data-fingerprint