X-Git-Url: https://git.p6c8.net/nextcloud-backup-restore.git/blobdiff_plain/d6c9915e32bd516a0ca23c2cb846e26472bf3019..f7117da82f1e493bdc1b2d583056526426788706:/NextcloudRestore.sh

diff --git a/NextcloudRestore.sh b/NextcloudRestore.sh
index 0a40210..200ff5f 100644
--- a/NextcloudRestore.sh
+++ b/NextcloudRestore.sh
@@ -2,7 +2,7 @@
 
 #
 # 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/
 #
@@ -21,13 +21,14 @@ 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: 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="MeInPasSw0rT"
+dbPassword="mYpAsSw0rd"
 # TODO: Your webserver user
 webserverUser="www-data"
 
@@ -76,6 +77,7 @@ cd "${nextcloudFileDir}"
 sudo -u "${webserverUser}" php occ maintenance:mode --on
 cd ~
 echo "Done"
+echo
 
 #
 # Stop webserver
@@ -83,6 +85,7 @@ echo "Done"
 echo "Stopping nginx..."
 service nginx stop
 echo "Done"
+echo
 
 #
 # Delete old Nextcloud direcories
@@ -91,10 +94,13 @@ 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
@@ -102,9 +108,12 @@ echo "Done"
 echo "Restoring Nextcloud file directory..."
 tar -xpzf "${currentRestoreDir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}"
 echo "Done"
+echo
+
 echo "Restoring Nextcloud data directory..."
 tar -xpzf "${currentRestoreDir}/${fileNameBackupDataDir}" -C "${nextcloudDataDir}"
 echo "Done"
+echo
 
 #
 # Restore database
@@ -112,12 +121,25 @@ 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
+#
+echo "Starting nginx..."
+service nginx start
+echo "Done"
+echo
 
 #
 # Set directory permissions
@@ -126,13 +148,18 @@ echo "Setting directory permissions..."
 chown -R "${webserverUser}" "${nextcloudFileDir}"
 chown -R "${webserverUser}" "${nextcloudDataDir}"
 echo "Done"
+echo
 
 #
-# Start webserver
+# Update the system data-fingerprint (see https://docs.nextcloud.com/server/12/admin_manual/configuration_server/occ_command.html#maintenance-commands-label)
 #
-echo "Starting nginx..."
-service nginx start
+echo "Updating the system data-fingerprint..."
+cd "${nextcloudFileDir}"
+sudo -u "${webserverUser}" php occ maintenance:data-fingerprint
+cd ~
 echo "Done"
+echo
+
 
 #
 # Restore hardened directory permissions
@@ -150,6 +177,7 @@ chown root:"${webserverUser}" "${nextcloudDataDir}/.htaccess"
 chmod 0644 "${nextcloudFileDir}/.htaccess"
 chmod 0644 "${nextcloudDataDir}/.htaccess"
 echo "Done"
+echo
 
 #
 # Disbale maintenance mode
@@ -159,15 +187,8 @@ cd "${nextcloudFileDir}"
 sudo -u "${webserverUser}" php occ maintenance:mode --off
 cd ~
 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)
-#
-echo "Updating the system data-fingerprint..."
-cd "${nextcloudFileDir}"
-sudo -u "${webserverUser}" php occ maintenance:data-fingerprint
-cd ~
-echo "Done"
-
+echo
 echo "DONE!"
-echo "Backup ${restore} successfully restored."
\ No newline at end of file
+echo "Backup ${restore} successfully restored."