Merge pull request #1 from BernieO/patch-1

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

diff --git a/NextcloudRestore.sh b/NextcloudRestore.sh
index 7ef3f81563c5b8d8eddcfb7ad18a2c2499abcc8c..dd110b0b2be12c075d1ecd259fbebc72525f52b7 100644 (file)
--- 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/
 #
@@ -77,6 +77,7 @@ cd "${nextcloudFileDir}"
 sudo -u "${webserverUser}" php occ maintenance:mode --on
 cd ~
 echo "Done"
+echo
 
 #
 # Stop webserver
@@ -84,6 +85,7 @@ echo "Done"
 echo "Stopping nginx..."
 service nginx stop
 echo "Done"
+echo
 
 #
 # Delete old Nextcloud direcories
@@ -92,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
@@ -103,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
@@ -113,12 +121,17 @@ 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
@@ -126,14 +139,16 @@ echo "Done"
 echo "Starting nginx..."
 service nginx 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)
@@ -143,24 +158,7 @@ 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"
-echo "Done"
+echo
 
 #
 # Disbale maintenance mode
@@ -170,6 +168,8 @@ cd "${nextcloudFileDir}"
 sudo -u "${webserverUser}" php occ maintenance:mode --off
 cd ~
 echo "Done"
+echo
 
+echo
 echo "DONE!"
 echo "Backup ${restore} successfully restored."