X-Git-Url: https://git.p6c8.net/nextcloud-backup-restore.git/blobdiff_plain/b34dbc415ef4a277ef972d2c728f072fb643d675..481131b8a80c1917387b854d16757b6d488cb78b:/NextcloudRestore.sh?ds=sidebyside

diff --git a/NextcloudRestore.sh b/NextcloudRestore.sh
index fffbc5a..b64d758 100644
--- 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)
 # 
-# 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,15 +15,15 @@
 
 # Variables
 # TODO: The directory where you store the Nextcloud backups
-backupMainDir="/mnt/Share/NextcloudBackups/"
+mainBackupDir="/mnt/Share/NextcloudBackups"
 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)
 # If your data directory is located under Nextcloud's file directory (somewhere in the web root), the data directory should not be restored separately
 nextcloudDataDir="/var/nextcloud_data"
-# TODO: The service name of the webserver. Used to start/stop webserver (e.g. 'service <webserverServiceName> start')
+# TODO: The service name of the web server. Used to start/stop web server (e.g. 'systemctl start <webserverServiceName>')
 webserverServiceName="nginx"
 # TODO: Your Nextcloud database name
 nextcloudDatabase="nextcloud_db"
@@ -31,7 +31,7 @@ nextcloudDatabase="nextcloud_db"
 dbUser="nextcloud_db_user"
 # TODO: The password of the Nextcloud database user
 dbPassword="mYpAsSw0rd"
-# TODO: Your webserver user
+# TODO: Your web server user
 webserverUser="www-data"
 
 # File names for backup files
@@ -82,10 +82,10 @@ echo "Done"
 echo
 
 #
-# Stop webserver
+# Stop web server
 #
-echo "Stopping webserver..."
-service "${webserverServiceName}" stop
+echo "Stopping web server..."
+systemctl stop "${webserverServiceName}"
 echo "Done"
 echo
 
@@ -108,12 +108,12 @@ echo
 # 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..."
-tar -xpzf "${currentRestoreDir}/${fileNameBackupDataDir}" -C "${nextcloudDataDir}"
+tar -xmpzf "${currentRestoreDir}/${fileNameBackupDataDir}" -C "${nextcloudDataDir}"
 echo "Done"
 echo
 
@@ -136,10 +136,10 @@ echo "Done"
 echo
 
 #
-# Start webserver
+# Start web server
 #
-echo "Starting webserver..."
-service "${webserverServiceName}" start
+echo "Starting web server..."
+systemctl start "${webserverServiceName}"
 echo "Done"
 echo
 
@@ -153,12 +153,10 @@ echo "Done"
 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/15/admin_manual/configuration_server/occ_command.html#maintenance-commands-label)
 #
 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
 
@@ -166,9 +164,7 @@ echo
 # 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