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

diff --git a/NextcloudRestore.sh b/NextcloudRestore.sh
index 7ef3f81..d754524 100644
--- a/NextcloudRestore.sh
+++ b/NextcloudRestore.sh
@@ -2,9 +2,9 @@
 
 #
 # Bash script for restoring backups of Nextcloud.
-# Usage: ./NextcloudRestor.sh <BackupName> (e.g. ./NextcloudRestor.sh 20170910_132703)
+# 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,21 +15,23 @@
 
 # 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 web server. Used to start/stop web server (e.g. 'service <webserverServiceName> start')
+webserverServiceName="nginx"
 # TODO: Your Nextcloud database name
 nextcloudDatabase="nextcloud_db"
 # TODO: Your Nextcloud database user
 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
@@ -77,13 +79,15 @@ cd "${nextcloudFileDir}"
 sudo -u "${webserverUser}" php occ maintenance:mode --on
 cd ~
 echo "Done"
+echo
 
 #
-# Stop webserver
+# Stop web server
 #
-echo "Stopping nginx..."
-service nginx stop
+echo "Stopping web server..."
+service "${webserverServiceName}" stop
 echo "Done"
+echo
 
 #
 # Delete old Nextcloud direcories
@@ -92,20 +96,26 @@ echo "Deleting old Nextcloud file directory..."
 rm -r "${nextcloudFileDir}"
 mkdir -p "${nextcloudFileDir}"
 echo "Done"
+echo
+
 echo "Deleting old Nextcloud data directory..."
 rm -r "${nextcloudDataDir}"
 mkdir -p "${nextcloudDataDir}"
 echo "Done"
+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
 
 #
 # Restore database
@@ -113,63 +123,51 @@ echo "Done"
 echo "Dropping old Nextcloud DB..."
 mysql -h localhost -u "${dbUser}" -p"${dbPassword}" -e "DROP DATABASE ${nextcloudDatabase}"
 echo "Done"
+echo
+
 echo "Creating new DB for Nextcloud..."
 mysql -h localhost -u "${dbUser}" -p"${dbPassword}" -e "CREATE DATABASE ${nextcloudDatabase}"
 echo "Done"
+echo
+
 echo "Restoring backup DB..."
 mysql -h localhost -u "${dbUser}" -p"${dbPassword}" "${nextcloudDatabase}" < "${currentRestoreDir}/${fileNameBackupDb}"
 echo "Done"
+echo
 
 #
-# Start webserver
+# Start web server
 #
-echo "Starting nginx..."
-service nginx start
+echo "Starting web server..."
+service "${webserverServiceName}" start
 echo "Done"
+echo
 
 #
 # Set directory permissions
 #
 echo "Setting directory permissions..."
-chown -R "${webserverUser}" "${nextcloudFileDir}"
-chown -R "${webserverUser}" "${nextcloudDataDir}"
+chown -R "${webserverUser}":"${webserverUser}" "${nextcloudFileDir}"
+chown -R "${webserverUser}":"${webserverUser}" "${nextcloudDataDir}"
 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/14/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 ~
-echo "Done"
-
-
-#
-# Restore hardened directory permissions
-#
-echo "Set hardened directory permissions..."
-find "${nextcloudFileDir}" -type f -print0 | xargs -0 chmod 0640
-find "${nextcloudFileDir}" -type d -print0 | xargs -0 chmod 0750
-chown -R root:"${webserverUser}" "${nextcloudFileDir}"
-chown -R "${webserverUser}":"${webserverUser}" "${nextcloudFileDir}/apps/"
-chown -R "${webserverUser}":"${webserverUser}" "${nextcloudFileDir}/config/"
-chown -R "${webserverUser}":"${webserverUser}" "${nextcloudFileDir}/themes/"
-chown -R "${webserverUser}":"${webserverUser}" "${nextcloudDataDir}"
-chown root:"${webserverUser}" "${nextcloudFileDir}/.htaccess"
-chown root:"${webserverUser}" "${nextcloudDataDir}/.htaccess"
-chmod 0644 "${nextcloudFileDir}/.htaccess"
-chmod 0644 "${nextcloudDataDir}/.htaccess"
+sudo -u "${webserverUser}" php ${nextcloudFileDir}/occ maintenance:data-fingerprint
 echo "Done"
+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
 
+echo
 echo "DONE!"
 echo "Backup ${restore} successfully restored."