No 'cd' for maintenace mode; added tar parameter 'm' for restore

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

diff --git a/NextcloudRestore.sh b/NextcloudRestore.sh
index bfc25deb2fc60f034cd019214172a2da042dee46..d75452484c23950fd69cabb22e91a50458ad32c3 100644 (file)
--- a/NextcloudRestore.sh
+++ b/NextcloudRestore.sh
@@ -4,7 +4,7 @@
 # Bash script for restoring backups of Nextcloud.
 # Usage: ./NextcloudRestore.sh <BackupName> (e.g. ./NextcloudRestore.sh 20170910_132703)
 # 
 # Bash script for restoring backups of Nextcloud.
 # Usage: ./NextcloudRestore.sh <BackupName> (e.g. ./NextcloudRestore.sh 20170910_132703)
 # 

-# The script is based on an installation of Nextcloud using nginx and MariaDB, see https://decatec.de/home-server/nextcloud-auf-ubuntu-server-mit-nginx-mariadb-php-lets-encrypt-redis-und-fail2ban/
+# The script is based on an installation of Nextcloud using nginx and MariaDB, see https://decatec.de/home-server/nextcloud-auf-ubuntu-server-18-04-lts-mit-nginx-mariadb-php-lets-encrypt-redis-und-fail2ban/

 #
 
 #
 #
 
 #


@@ -15,9 +15,9 @@
 
 # Variables
 # TODO: The directory where you store the Nextcloud backups
 
 # Variables
 # TODO: The directory where you store the Nextcloud backups

-backupMainDir="/mnt/Share/NextcloudBackups/"
+mainBackupDir="/mnt/Share/NextcloudBackups"

 restore=$1
 restore=$1

-currentRestoreDir="${mainBackupdir}/${restore}"
+currentRestoreDir="${mainBackupDir}/${restore}"

 # TODO: The directory of your Nextcloud installation (this is a directory under your web root)
 nextcloudFileDir="/var/www/nextcloud"
 # TODO: The directory of your Nextcloud data directory (outside the Nextcloud file directory)
 # TODO: The directory of your Nextcloud installation (this is a directory under your web root)
 nextcloudFileDir="/var/www/nextcloud"
 # TODO: The directory of your Nextcloud data directory (outside the Nextcloud file directory)


@@ -108,12 +108,12 @@ echo
 # Restore file and data directory
 #
 echo "Restoring Nextcloud file directory..."
 # Restore file and data directory
 #
 echo "Restoring Nextcloud file directory..."

-tar -xpzf "${currentRestoreDir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}"
+tar -xmpzf "${currentRestoreDir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}"

 echo "Done"
 echo
 
 echo "Restoring Nextcloud data directory..."
 echo "Done"
 echo
 
 echo "Restoring Nextcloud data directory..."

-tar -xpzf "${currentRestoreDir}/${fileNameBackupDataDir}" -C "${nextcloudDataDir}"
+tar -xmpzf "${currentRestoreDir}/${fileNameBackupDataDir}" -C "${nextcloudDataDir}"

 echo "Done"
 echo
 
 echo "Done"
 echo
 


@@ -153,12 +153,10 @@ echo "Done"
 echo
 
 #
 echo
 
 #

-# Update the system data-fingerprint (see https://docs.nextcloud.com/server/12/admin_manual/configuration_server/occ_command.html#maintenance-commands-label)
+# Update the system data-fingerprint (see https://docs.nextcloud.com/server/14/admin_manual/configuration_server/occ_command.html#maintenance-commands-label)

 #
 echo "Updating the system data-fingerprint..."
 #
 echo "Updating the system data-fingerprint..."

-cd "${nextcloudFileDir}"
-sudo -u "${webserverUser}" php occ maintenance:data-fingerprint
-cd ~
+sudo -u "${webserverUser}" php ${nextcloudFileDir}/occ maintenance:data-fingerprint

 echo "Done"
 echo
 
 echo "Done"
 echo
 


@@ -166,9 +164,7 @@ echo
 # Disbale maintenance mode
 #
 echo "Switching off maintenance mode..."
 # Disbale maintenance mode
 #
 echo "Switching off maintenance mode..."

-cd "${nextcloudFileDir}"
-sudo -u "${webserverUser}" php occ maintenance:mode --off
-cd ~
+sudo -u "${webserverUser}" php ${nextcloudFileDir}/occ maintenance:mode --off

 echo "Done"
 echo
 
 echo "Done"
 echo