v2.3.2

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e872ba2e6ae58356ddac3cddd639150f6782ca6a..10240ab2a9c29d226e5cb9662fafbb6bf94f9cd8 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
 # Changelog
 

+## 2.3.2
+
+### Restore
+- Bugfix: Compression command on restore
+
+### Setup
+- Hint for installing pigz when using compression
+- Bugfix: Set variable `backupMainDir` correctly
+

 ## 2.3.1
 
 ### General
 ## 2.3.1
 
 ### General

diff --git a/NextcloudBackup.sh b/NextcloudBackup.sh
index 8d8149c7f4b203fccf2100f80b80db0e7ecba751..a60eb967b953d2d9714605456e423d2a710adbec 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.3.1
+# Version 2.3.2

 #
 # Requirements:
 #      - pigz (https://zlib.net/pigz/) for using backup compression. If not available, you can use another compression algorithm (e.g. gzip)
 #
 # Requirements:
 #      - pigz (https://zlib.net/pigz/) for using backup compression. If not available, you can use another compression algorithm (e.g. gzip)


@@ -14,7 +14,7 @@
 #
 # Usage:
 #      - With backup directory specified in the script:  ./NextcloudBackup.sh
 #
 # Usage:
 #      - With backup directory specified in the script:  ./NextcloudBackup.sh

-#      - With backup directory specified by parameter: ./NextcloudBackup.sh <BackupDirectory> (e.g. ./NextcloudBackup.sh /media/hdd/nextcloud_backup)
+#      - With backup directory specified by parameter: ./NextcloudBackup.sh <backupDirectory> (e.g. ./NextcloudBackup.sh /media/hdd/nextcloud_backup)

 #
 # The script is based on an installation of Nextcloud using nginx and MariaDB, see https://decatec.de/home-server/nextcloud-auf-ubuntu-server-20-04-lts-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-20-04-lts-mit-nginx-mariadb-php-lets-encrypt-redis-und-fail2ban/
 #


@@ -41,7 +41,7 @@ fi
 currentDate=$(date +"%Y%m%d_%H%M%S")
 
 # The actual directory of the current backup - this is a subdirectory of the main directory above with a timestamp
 currentDate=$(date +"%Y%m%d_%H%M%S")
 
 # The actual directory of the current backup - this is a subdirectory of the main directory above with a timestamp

-backupdir="${backupMainDir}/${currentDate}"
+backupDir="${backupMainDir}/${currentDate}"

 
 # TODO: Use compression for file/data dir
 # When this is the only script for backups, it's recommend to enable compression.
 
 # TODO: Use compression for file/data dir
 # When this is the only script for backups, it's recommend to enable compression.


@@ -160,11 +160,11 @@ fi
 #
 # Check if backup dir already exists
 #
 #
 # Check if backup dir already exists
 #

-if [ ! -d "${backupdir}" ]
+if [ ! -d "${backupDir}" ]

 then
 then

-       mkdir -p "${backupdir}"
+       mkdir -p "${backupDir}"

 else
 else

-       errorecho "ERROR: The backup directory ${backupdir} already exists!"
+       errorecho "ERROR: The backup directory ${backupDir} already exists!"

        exit 1
 fi
 
        exit 1
 fi
 


@@ -190,9 +190,9 @@ echo
 echo "$(date +"%H:%M:%S"): Creating backup of Nextcloud file directory..."
 
 if [ "$useCompression" = true ] ; then
 echo "$(date +"%H:%M:%S"): Creating backup of Nextcloud file directory..."
 
 if [ "$useCompression" = true ] ; then

-       `$compressionCommand "${backupdir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}" .`
+       `$compressionCommand "${backupDir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}" .`

 else
 else

-       tar -cpf "${backupdir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}" .
+       tar -cpf "${backupDir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}" .

 fi
 
 echo "Done"
 fi
 
 echo "Done"


@@ -207,15 +207,15 @@ if [ "$ignoreUpdaterBackups" = true ] ; then
        echo "Ignoring updater backup directory"
 
        if [ "$useCompression" = true ] ; then
        echo "Ignoring updater backup directory"
 
        if [ "$useCompression" = true ] ; then

-               `$compressionCommand "${backupdir}/${fileNameBackupDataDir}"  --exclude="updater-*/backups/*" -C "${nextcloudDataDir}" .`
+               `$compressionCommand "${backupDir}/${fileNameBackupDataDir}"  --exclude="updater-*/backups/*" -C "${nextcloudDataDir}" .`

        else
        else

-               tar -cpf "${backupdir}/${fileNameBackupDataDir}"  --exclude="updater-*/backups/*" -C "${nextcloudDataDir}" .
+               tar -cpf "${backupDir}/${fileNameBackupDataDir}"  --exclude="updater-*/backups/*" -C "${nextcloudDataDir}" .

        fi
 else
        if [ "$useCompression" = true ] ; then
        fi
 else
        if [ "$useCompression" = true ] ; then

-               `$compressionCommand "${backupdir}/${fileNameBackupDataDir}"  -C "${nextcloudDataDir}" .`
+               `$compressionCommand "${backupDir}/${fileNameBackupDataDir}"  -C "${nextcloudDataDir}" .`

        else
        else

-               tar -cpf "${backupdir}/${fileNameBackupDataDir}"  -C "${nextcloudDataDir}" .
+               tar -cpf "${backupDir}/${fileNameBackupDataDir}"  -C "${nextcloudDataDir}" .

        fi
 fi
 
        fi
 fi
 


@@ -229,9 +229,9 @@ if [ ! -z "${nextcloudLocalExternalDataDir+x}" ] ; then
        echo "$(date +"%H:%M:%S"): Creating backup of Nextcloud local external storage directory..."
 
        if [ "$useCompression" = true ] ; then
        echo "$(date +"%H:%M:%S"): Creating backup of Nextcloud local external storage directory..."
 
        if [ "$useCompression" = true ] ; then

-               `$compressionCommand "${backupdir}/${fileNameBackupExternalDataDir}"  -C "${nextcloudLocalExternalDataDir}" .`
+               `$compressionCommand "${backupDir}/${fileNameBackupExternalDataDir}"  -C "${nextcloudLocalExternalDataDir}" .`

        else
        else

-               tar -cpf "${backupdir}/${fileNameBackupExternalDataDir}"  -C "${nextcloudLocalExternalDataDir}" .
+               tar -cpf "${backupDir}/${fileNameBackupExternalDataDir}"  -C "${nextcloudLocalExternalDataDir}" .

        fi
 
        echo "Done"
        fi
 
        echo "Done"


@@ -248,7 +248,7 @@ if [ "${databaseSystem,,}" = "mysql" ] || [ "${databaseSystem,,}" = "mariadb" ];
                errorecho "ERROR: MySQL/MariaDB not installed (command mysqldump not found)."
                errorecho "ERROR: No backup of database possible!"
        else
                errorecho "ERROR: MySQL/MariaDB not installed (command mysqldump not found)."
                errorecho "ERROR: No backup of database possible!"
        else

-               mysqldump --single-transaction -h localhost -u "${dbUser}" -p"${dbPassword}" "${nextcloudDatabase}" > "${backupdir}/${fileNameBackupDb}"
+               mysqldump --single-transaction -h localhost -u "${dbUser}" -p"${dbPassword}" "${nextcloudDatabase}" > "${backupDir}/${fileNameBackupDb}"

        fi
 
        echo "Done"
        fi
 
        echo "Done"


@@ -260,7 +260,7 @@ elif [ "${databaseSystem,,}" = "postgresql" ] || [ "${databaseSystem,,}" = "pgsq
                errorecho "ERROR: PostgreSQL not installed (command pg_dump not found)."
                errorecho "ERROR: No backup of database possible!"
        else
                errorecho "ERROR: PostgreSQL not installed (command pg_dump not found)."
                errorecho "ERROR: No backup of database possible!"
        else

-               PGPASSWORD="${dbPassword}" pg_dump "${nextcloudDatabase}" -h localhost -U "${dbUser}" -f "${backupdir}/${fileNameBackupDb}"
+               PGPASSWORD="${dbPassword}" pg_dump "${nextcloudDatabase}" -h localhost -U "${dbUser}" -f "${backupDir}/${fileNameBackupDb}"

        fi
        
        echo "Done"
        fi
        
        echo "Done"


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

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

diff --git a/NextcloudRestore.sh b/NextcloudRestore.sh
index 60825b8f5b35fa7e3fa1088e6b82ce2becd6465e..90fa3360af9a3e746557f596e17a5bba1c91004e 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.3.1
+# Version 2.3.2

 #
 # Requirements:
 #      - pigz (https://zlib.net/pigz/) for using backup compression. If not available, you can use another compression algorithm (e.g. gzip)
 #
 # Requirements:
 #      - pigz (https://zlib.net/pigz/) for using backup compression. If not available, you can use another compression algorithm (e.g. gzip)


@@ -34,7 +34,7 @@ backupMainDir=${2:-}
 
 if [ -z "$backupMainDir" ]; then
        # TODO: The directory where you store the Nextcloud backups (when not specified by args)
 
 if [ -z "$backupMainDir" ]; then
        # TODO: The directory where you store the Nextcloud backups (when not specified by args)

-    backupMainDir='/media/hdd/nextcloud_backup'
+       backupMainDir='/media/hdd/nextcloud_backup'

 fi
 
 echo "Backup directory: $backupMainDir"
 fi
 
 echo "Backup directory: $backupMainDir"


@@ -46,7 +46,7 @@ useCompression=true
 
 # TOOD: The bare tar command for using compression.
 # Use 'tar -xmpzf' if you want to use gzip compression.
 
 # TOOD: The bare tar command for using compression.
 # Use 'tar -xmpzf' if you want to use gzip compression.

-compressionCommand="tar -I pigz -cpf"
+compressionCommand="tar -I pigz -xmpf"

 
 # 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 installation (this is a directory under your web root)
 nextcloudFileDir='/var/www/nextcloud'

diff --git a/setup.sh b/setup.sh
index ed29c3eb0d5d0051b7afca148d85600f11d2045a..43fcee45320c8d0671d31db0157d16878b57f984 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -3,7 +3,7 @@
 #
 # Bash script an easy setup of NextcloudBackup.sh and NextcloudRestore.sh
 #
 #
 # Bash script an easy setup of NextcloudBackup.sh and NextcloudRestore.sh
 #

-# Version 2.3.0
+# Version 2.3.2

 #
 # Usage:
 #      - call the setup.sh script
 #
 # Usage:
 #      - call the setup.sh script


@@ -104,8 +104,8 @@ echo "Modifying NextcloudBackup.sh and NextcloudRestore.sh to match your install
 echo ""
 
 # Backup main dir
 echo ""
 
 # Backup main dir

-sed -i "s@^    backupMainDir.*@    backupMainDir='$backupMainDir'@" ./NextcloudBackup.sh
-sed -i "s@^    backupMainDir.*@    backupMainDir='$backupMainDir'@" ./NextcloudRestore.sh
+sed -i "s@^\tbackupMainDir='/media/hdd/nextcloud_backup'@\tbackupMainDir='$backupMainDir'@" ./NextcloudBackup.sh
+sed -i "s@^\tbackupMainDir='/media/hdd/nextcloud_backup'@\tbackupMainDir='$backupMainDir'@" ./NextcloudRestore.sh

 
 # Nextcloud file dir
 sed -i "s@^nextcloudFileDir.*@nextcloudFileDir='$nextcloudFileDir'@" ./NextcloudBackup.sh
 
 # Nextcloud file dir
 sed -i "s@^nextcloudFileDir.*@nextcloudFileDir='$nextcloudFileDir'@" ./NextcloudBackup.sh


@@ -160,4 +160,6 @@ echo ""
 echo ""
 echo "IMPORTANT: Please check NextcloudBackup.sh and NextcloudRestore.sh if all variables were set correctly BEFORE running these scripts!"
 echo ""
 echo ""
 echo "IMPORTANT: Please check NextcloudBackup.sh and NextcloudRestore.sh if all variables were set correctly BEFORE running these scripts!"
 echo ""

+echo "When using pigz compression, you also have to install pigz (e.g. for Debian/Ubuntu: apt install pigz)"
+echo ""

 echo ""
\ No newline at end of file
 echo ""
\ No newline at end of file