Merge pull request #7 from timkrief/mainBackupDir-Fix

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

diff --git a/NextcloudRestore.sh b/NextcloudRestore.sh
index 200ff5f2f2ad97d36cf00a1db98ae04c69d2a277..eeaa2eaebdf6e3047101a5f474e37d66b2644246 100644 (file)
--- a/NextcloudRestore.sh
+++ b/NextcloudRestore.sh
@@ -15,21 +15,23 @@
 
 # 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)
 # 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 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 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
 webserverUser="www-data"
 
 # File names for backup files


@@ -80,10 +82,10 @@ echo "Done"
 echo
 
 #
 echo
 
 #

-# Stop webserver
+# Stop web server

 #
 #

-echo "Stopping nginx..."
-service nginx stop
+echo "Stopping web server..."
+service "${webserverServiceName}" stop

 echo "Done"
 echo
 
 echo "Done"
 echo
 


@@ -134,10 +136,10 @@ echo "Done"
 echo
 
 #
 echo
 
 #

-# Start webserver
+# Start web server

 #
 #

-echo "Starting nginx..."
-service nginx start
+echo "Starting web server..."
+service "${webserverServiceName}" start

 echo "Done"
 echo
 
 echo "Done"
 echo
 


@@ -145,8 +147,8 @@ echo
 # Set directory permissions
 #
 echo "Setting directory permissions..."
 # 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
 
 echo "Done"
 echo
 


@@ -160,25 +162,6 @@ cd ~
 echo "Done"
 echo
 
 echo "Done"
 echo
 

-
-#
-# 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
 #
 #
 # Disbale maintenance mode
 #