Added timestamps for every step

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 438198d1a1efc940521cf3fb8523dbeb24b96b9b..d4708e8ec74a59d2034517246d105421ad0b6042 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
 # Changelog
 

+## 2.1.3
+
+### General
+- Added timestamps for every step.
+

 ## 2.1.2
 
 ### General
 ## 2.1.2
 
 ### General

diff --git a/NextcloudBackup.sh b/NextcloudBackup.sh
index 3e0d2a5df099298278ad8b6c629fda9c10f14e34..e5614fbdcdbfbae1ebd1643239e2fc394ce39f39 100644 (file)
--- a/NextcloudBackup.sh
+++ b/NextcloudBackup.sh
@@ -3,7 +3,7 @@
 #
 # Bash script for creating backups of Nextcloud.
 #
 #
 # Bash script for creating backups of Nextcloud.
 #

-# Version 2.1.2
+# Version 2.1.3

 #
 # Usage:
 #      - With backup directory specified in the script:  ./NextcloudBackup.sh
 #
 # Usage:
 #      - With backup directory specified in the script:  ./NextcloudBackup.sh


@@ -98,7 +98,7 @@ fileNameBackupDb='nextcloud-db.sql'
 errorecho() { cat <<< "$@" 1>&2; }
 
 function DisableMaintenanceMode() {
 errorecho() { cat <<< "$@" 1>&2; }
 
 function DisableMaintenanceMode() {

-       echo "Switching off maintenance mode..."
+       echo "$(date +"%H:%M:%S"): Switching off maintenance mode..."

        sudo -u "${webserverUser}" php ${nextcloudFileDir}/occ maintenance:mode --off
        echo "Done"
        echo
        sudo -u "${webserverUser}" php ${nextcloudFileDir}/occ maintenance:mode --off
        echo "Done"
        echo


@@ -154,7 +154,7 @@ fi
 #
 # Set maintenance mode
 #
 #
 # Set maintenance mode
 #

-echo "Set maintenance mode for Nextcloud..."
+echo "$(date +"%H:%M:%S"): Set maintenance mode for Nextcloud..."

 sudo -u "${webserverUser}" php ${nextcloudFileDir}/occ maintenance:mode --on
 echo "Done"
 echo
 sudo -u "${webserverUser}" php ${nextcloudFileDir}/occ maintenance:mode --on
 echo "Done"
 echo


@@ -162,7 +162,7 @@ echo
 #
 # Stop web server
 #
 #
 # Stop web server
 #

-echo "Stopping web server..."
+echo "$(date +"%H:%M:%S"): Stopping web server..."

 systemctl stop "${webserverServiceName}"
 echo "Done"
 echo
 systemctl stop "${webserverServiceName}"
 echo "Done"
 echo


@@ -170,7 +170,7 @@ echo
 #
 # Backup file directory
 #
 #
 # Backup file directory
 #

-echo "Creating backup of Nextcloud file directory..."
+echo "$(date +"%H:%M:%S"): Creating backup of Nextcloud file directory..."

 
 if [ "$useCompression" = true ] ; then
        tar -I pigz -cpf "${backupdir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}" .
 
 if [ "$useCompression" = true ] ; then
        tar -I pigz -cpf "${backupdir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}" .


@@ -184,7 +184,7 @@ echo
 #
 # Backup data directory
 #
 #
 # Backup data directory
 #

-echo "Creating backup of Nextcloud data directory..."
+echo "$(date +"%H:%M:%S"): Creating backup of Nextcloud data directory..."

 
 if [ "$ignoreUpdaterBackups" = true ] ; then
        echo "Ignoring updater backup directory"
 
 if [ "$ignoreUpdaterBackups" = true ] ; then
        echo "Ignoring updater backup directory"


@@ -207,7 +207,7 @@ echo
 
 # Backup local external storage.
 # Uncomment if you use local external storage
 
 # Backup local external storage.
 # Uncomment if you use local external storage

-#echo "Creating backup of Nextcloud local external storage directory..."
+#echo "$(date +"%H:%M:%S"): Creating backup of Nextcloud local external storage directory..."

 
 #if [ "$useCompression" = true ] ; then
 #      tar -I pigz -cpf "${backupdir}/${fileNameBackupExternalDataDir}"  -C "${nextcloudLocalExternalDataDir}" .
 
 #if [ "$useCompression" = true ] ; then
 #      tar -I pigz -cpf "${backupdir}/${fileNameBackupExternalDataDir}"  -C "${nextcloudLocalExternalDataDir}" .


@@ -222,7 +222,7 @@ echo
 # Backup DB
 #
 if [ "${databaseSystem,,}" = "mysql" ] || [ "${databaseSystem,,}" = "mariadb" ]; then
 # Backup DB
 #
 if [ "${databaseSystem,,}" = "mysql" ] || [ "${databaseSystem,,}" = "mariadb" ]; then

-       echo "Backup Nextcloud database (MySQL/MariaDB)..."
+       echo "$(date +"%H:%M:%S"): Backup Nextcloud database (MySQL/MariaDB)..."

 
        if ! [ -x "$(command -v mysqldump)" ]; then
                errorecho "ERROR: MySQL/MariaDB not installed (command mysqldump not found)."
 
        if ! [ -x "$(command -v mysqldump)" ]; then
                errorecho "ERROR: MySQL/MariaDB not installed (command mysqldump not found)."


@@ -234,7 +234,7 @@ if [ "${databaseSystem,,}" = "mysql" ] || [ "${databaseSystem,,}" = "mariadb" ];
        echo "Done"
        echo
 elif [ "${databaseSystem,,}" = "postgresql" ] || [ "${databaseSystem,,}" = "pgsql" ]; then
        echo "Done"
        echo
 elif [ "${databaseSystem,,}" = "postgresql" ] || [ "${databaseSystem,,}" = "pgsql" ]; then

-       echo "Backup Nextcloud database (PostgreSQL)..."
+       echo "$(date +"%H:%M:%S"): Backup Nextcloud database (PostgreSQL)..."

 
        if ! [ -x "$(command -v pg_dump)" ]; then
                errorecho "ERROR: PostgreSQL not installed (command pg_dump not found)."
 
        if ! [ -x "$(command -v pg_dump)" ]; then
                errorecho "ERROR: PostgreSQL not installed (command pg_dump not found)."


@@ -250,7 +250,7 @@ fi
 #
 # Start web server
 #
 #
 # Start web server
 #

-echo "Starting web server..."
+echo "$(date +"%H:%M:%S"): Starting web server..."

 systemctl start "${webserverServiceName}"
 echo "Done"
 echo
 systemctl start "${webserverServiceName}"
 echo "Done"
 echo


@@ -269,7 +269,7 @@ then
 
        if [ ${nrOfBackups} -gt ${maxNrOfBackups} ]
        then
 
        if [ ${nrOfBackups} -gt ${maxNrOfBackups} ]
        then

-               echo "Removing old backups..."
+               echo "$(date +"%H:%M:%S"): Removing old backups..."

                ls -t ${backupMainDir} | tail -$(( nrOfBackups - maxNrOfBackups )) | while read -r dirToRemove; do
                        echo "${dirToRemove}"
                        rm -r "${backupMainDir}/${dirToRemove:?}"
                ls -t ${backupMainDir} | tail -$(( nrOfBackups - maxNrOfBackups )) | while read -r dirToRemove; do
                        echo "${dirToRemove}"
                        rm -r "${backupMainDir}/${dirToRemove:?}"


@@ -281,4 +281,4 @@ fi
 
 echo
 echo "DONE!"
 
 echo
 echo "DONE!"

-echo "Backup created: ${backupdir}"
+echo "$(date +"%H:%M:%S"): Backup created: ${backupdir}"

diff --git a/NextcloudRestore.sh b/NextcloudRestore.sh
index ee6d44fff20e9fea73d02659671cbded5d0e750e..abc977de9e16fdd022047d68d42ba4950a3ded19 100644 (file)
--- a/NextcloudRestore.sh
+++ b/NextcloudRestore.sh
@@ -3,7 +3,7 @@
 #
 # Bash script for restoring backups of Nextcloud.
 #
 #
 # Bash script for restoring backups of Nextcloud.
 #

-# Version 2.1.2
+# Version 2.1.3

 #
 # Usage:
 #   - With backup directory specified in the script: ./NextcloudRestore.sh <BackupName> (e.g. ./NextcloudRestore.sh 20170910_132703)
 #
 # Usage:
 #   - With backup directory specified in the script: ./NextcloudRestore.sh <BackupName> (e.g. ./NextcloudRestore.sh 20170910_132703)


@@ -135,7 +135,7 @@ fi
 #
 # Set maintenance mode
 #
 #
 # Set maintenance mode
 #

-echo "Set maintenance mode for Nextcloud..."
+echo "$(date +"%H:%M:%S"): Set maintenance mode for Nextcloud..."

 sudo -u "${webserverUser}" php ${nextcloudFileDir}/occ maintenance:mode --on
 echo "Done"
 echo
 sudo -u "${webserverUser}" php ${nextcloudFileDir}/occ maintenance:mode --on
 echo "Done"
 echo


@@ -143,7 +143,7 @@ echo
 #
 # Stop web server
 #
 #
 # Stop web server
 #

-echo "Stopping web server..."
+echo "$(date +"%H:%M:%S"): Stopping web server..."

 systemctl stop "${webserverServiceName}"
 echo "Done"
 echo
 systemctl stop "${webserverServiceName}"
 echo "Done"
 echo


@@ -153,14 +153,14 @@ echo
 #
 
 # File directory
 #
 
 # File directory

-echo "Deleting old Nextcloud file directory..."
+echo "$(date +"%H:%M:%S"): Deleting old Nextcloud file directory..."

 rm -r "${nextcloudFileDir}"
 mkdir -p "${nextcloudFileDir}"
 echo "Done"
 echo
 
 # Data directory
 rm -r "${nextcloudFileDir}"
 mkdir -p "${nextcloudFileDir}"
 echo "Done"
 echo
 
 # Data directory

-echo "Deleting old Nextcloud data directory..."
+echo "$(date +"%H:%M:%S"): Deleting old Nextcloud data directory..."

 rm -r "${nextcloudDataDir}"
 mkdir -p "${nextcloudDataDir}"
 echo "Done"
 rm -r "${nextcloudDataDir}"
 mkdir -p "${nextcloudDataDir}"
 echo "Done"


@@ -179,7 +179,7 @@ echo
 #
 
 # File directory
 #
 
 # File directory

-echo "Restoring Nextcloud file directory..."
+echo "$(date +"%H:%M:%S"): Restoring Nextcloud file directory..."

 
 if [ "$useCompression" = true ] ; then
     tar -I pigz -xmpf "${currentRestoreDir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}"
 
 if [ "$useCompression" = true ] ; then
     tar -I pigz -xmpf "${currentRestoreDir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}"


@@ -191,7 +191,7 @@ echo "Done"
 echo
 
 # Data directory
 echo
 
 # Data directory

-echo "Restoring Nextcloud data directory..."
+echo "$(date +"%H:%M:%S"): Restoring Nextcloud data directory..."

 
 if [ "$useCompression" = true ] ; then
     tar -I pigz -xmpf "${currentRestoreDir}/${fileNameBackupDataDir}" -C "${nextcloudDataDir}"
 
 if [ "$useCompression" = true ] ; then
     tar -I pigz -xmpf "${currentRestoreDir}/${fileNameBackupDataDir}" -C "${nextcloudDataDir}"


@@ -204,7 +204,7 @@ echo
 
 # Local external storage
 # TODO: Uncomment if you use local external storage
 
 # Local external storage
 # TODO: Uncomment if you use local external storage

-#echo "Restoring Nextcloud data directory..."
+#echo "$(date +"%H:%M:%S"): Restoring Nextcloud data directory..."

 #
 #if [ "$useCompression" = true ] ; then
 #    tar -I pigz -xmpf "${currentRestoreDir}/${fileNameBackupExternalDataDir}" -C "${nextcloudLocalExternalDataDir}"
 #
 #if [ "$useCompression" = true ] ; then
 #    tar -I pigz -xmpf "${currentRestoreDir}/${fileNameBackupExternalDataDir}" -C "${nextcloudLocalExternalDataDir}"


@@ -218,7 +218,7 @@ echo
 #
 # Restore database
 #
 #
 # Restore database
 #

-echo "Dropping old Nextcloud DB..."
+echo "$(date +"%H:%M:%S"): Dropping old Nextcloud DB..."

 
 if [ "${databaseSystem,,}" = "mysql" ] || [ "${databaseSystem,,}" = "mariadb" ]; then
     mysql -h localhost -u "${dbUser}" -p"${dbPassword}" -e "DROP DATABASE ${nextcloudDatabase}"
 
 if [ "${databaseSystem,,}" = "mysql" ] || [ "${databaseSystem,,}" = "mariadb" ]; then
     mysql -h localhost -u "${dbUser}" -p"${dbPassword}" -e "DROP DATABASE ${nextcloudDatabase}"


@@ -229,7 +229,7 @@ fi
 echo "Done"
 echo
 
 echo "Done"
 echo
 

-echo "Creating new DB for Nextcloud..."
+echo "$(date +"%H:%M:%S"): Creating new DB for Nextcloud..."

 
 if [ "${databaseSystem,,}" = "mysql" ] || [ "${databaseSystem,,}" = "mariadb" ]; then
     # Use this if the databse from the backup uses UTF8 with multibyte support (e.g. for emoijs in filenames):
 
 if [ "${databaseSystem,,}" = "mysql" ] || [ "${databaseSystem,,}" = "mariadb" ]; then
     # Use this if the databse from the backup uses UTF8 with multibyte support (e.g. for emoijs in filenames):


@@ -243,7 +243,7 @@ fi
 echo "Done"
 echo
 
 echo "Done"
 echo
 

-echo "Restoring backup DB..."
+echo "$(date +"%H:%M:%S"): Restoring backup DB..."

 
 if [ "${databaseSystem,,}" = "mysql" ] || [ "${databaseSystem,,}" = "mariadb" ]; then
        mysql -h localhost -u "${dbUser}" -p"${dbPassword}" "${nextcloudDatabase}" < "${currentRestoreDir}/${fileNameBackupDb}"
 
 if [ "${databaseSystem,,}" = "mysql" ] || [ "${databaseSystem,,}" = "mariadb" ]; then
        mysql -h localhost -u "${dbUser}" -p"${dbPassword}" "${nextcloudDatabase}" < "${currentRestoreDir}/${fileNameBackupDb}"


@@ -257,7 +257,7 @@ echo
 #
 # Start web server
 #
 #
 # Start web server
 #

-echo "Starting web server..."
+echo "$(date +"%H:%M:%S"): Starting web server..."

 systemctl start "${webserverServiceName}"
 echo "Done"
 echo
 systemctl start "${webserverServiceName}"
 echo "Done"
 echo


@@ -265,7 +265,7 @@ echo
 #
 # Set directory permissions
 #
 #
 # Set directory permissions
 #

-echo "Setting directory permissions..."
+echo "$(date +"%H:%M:%S"): Setting directory permissions..."

 chown -R "${webserverUser}":"${webserverUser}" "${nextcloudFileDir}"
 chown -R "${webserverUser}":"${webserverUser}" "${nextcloudDataDir}"
 # TODO: Uncomment if you use local external storage
 chown -R "${webserverUser}":"${webserverUser}" "${nextcloudFileDir}"
 chown -R "${webserverUser}":"${webserverUser}" "${nextcloudDataDir}"
 # TODO: Uncomment if you use local external storage


@@ -276,7 +276,7 @@ echo
 #
 # Update the system data-fingerprint (see https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html#maintenance-commands-label)
 #
 #
 # Update the system data-fingerprint (see https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html#maintenance-commands-label)
 #

-echo "Updating the system data-fingerprint..."
+echo "$(date +"%H:%M:%S"): Updating the system data-fingerprint..."

 sudo -u "${webserverUser}" php ${nextcloudFileDir}/occ maintenance:data-fingerprint
 echo "Done"
 echo
 sudo -u "${webserverUser}" php ${nextcloudFileDir}/occ maintenance:data-fingerprint
 echo "Done"
 echo


@@ -284,11 +284,11 @@ echo
 #
 # Disbale maintenance mode
 #
 #
 # Disbale maintenance mode
 #

-echo "Switching off maintenance mode..."
+echo "$(date +"%H:%M:%S"): Switching off maintenance mode..."

 sudo -u "${webserverUser}" php ${nextcloudFileDir}/occ maintenance:mode --off
 echo "Done"
 echo
 
 echo
 echo "DONE!"
 sudo -u "${webserverUser}" php ${nextcloudFileDir}/occ maintenance:mode --off
 echo "Done"
 echo
 
 echo
 echo "DONE!"

-echo "Backup ${restore} successfully restored."
\ No newline at end of file
+echo "$(date +"%H:%M:%S"): Backup ${restore} successfully restored."
\ No newline at end of file