From 9381631aa527efa45952846a4a4f9ac822599825 Mon Sep 17 00:00:00 2001 From: DecaTec Date: Sat, 6 Nov 2021 09:04:17 +0100 Subject: [PATCH 1/1] v2.3.2 --- CHANGELOG.md | 9 +++++++++ NextcloudBackup.sh | 34 +++++++++++++++++----------------- NextcloudRestore.sh | 6 +++--- setup.sh | 8 +++++--- 4 files changed, 34 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e872ba2..10240ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # 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 diff --git a/NextcloudBackup.sh b/NextcloudBackup.sh index 8d8149c..a60eb96 100644 --- a/NextcloudBackup.sh +++ b/NextcloudBackup.sh @@ -3,7 +3,7 @@ # # 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) @@ -14,7 +14,7 @@ # # Usage: # - With backup directory specified in the script: ./NextcloudBackup.sh -# - With backup directory specified by parameter: ./NextcloudBackup.sh (e.g. ./NextcloudBackup.sh /media/hdd/nextcloud_backup) +# - With backup directory specified by parameter: ./NextcloudBackup.sh (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/ # @@ -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 -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. @@ -160,11 +160,11 @@ fi # # Check if backup dir already exists # -if [ ! -d "${backupdir}" ] +if [ ! -d "${backupDir}" ] then - mkdir -p "${backupdir}" + mkdir -p "${backupDir}" else - errorecho "ERROR: The backup directory ${backupdir} already exists!" + errorecho "ERROR: The backup directory ${backupDir} already exists!" exit 1 fi @@ -190,9 +190,9 @@ echo 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 - tar -cpf "${backupdir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}" . + tar -cpf "${backupDir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}" . fi echo "Done" @@ -207,15 +207,15 @@ if [ "$ignoreUpdaterBackups" = 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 - tar -cpf "${backupdir}/${fileNameBackupDataDir}" --exclude="updater-*/backups/*" -C "${nextcloudDataDir}" . + tar -cpf "${backupDir}/${fileNameBackupDataDir}" --exclude="updater-*/backups/*" -C "${nextcloudDataDir}" . fi else if [ "$useCompression" = true ] ; then - `$compressionCommand "${backupdir}/${fileNameBackupDataDir}" -C "${nextcloudDataDir}" .` + `$compressionCommand "${backupDir}/${fileNameBackupDataDir}" -C "${nextcloudDataDir}" .` else - tar -cpf "${backupdir}/${fileNameBackupDataDir}" -C "${nextcloudDataDir}" . + tar -cpf "${backupDir}/${fileNameBackupDataDir}" -C "${nextcloudDataDir}" . 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 - `$compressionCommand "${backupdir}/${fileNameBackupExternalDataDir}" -C "${nextcloudLocalExternalDataDir}" .` + `$compressionCommand "${backupDir}/${fileNameBackupExternalDataDir}" -C "${nextcloudLocalExternalDataDir}" .` else - tar -cpf "${backupdir}/${fileNameBackupExternalDataDir}" -C "${nextcloudLocalExternalDataDir}" . + tar -cpf "${backupDir}/${fileNameBackupExternalDataDir}" -C "${nextcloudLocalExternalDataDir}" . 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 - 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" @@ -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 - 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" @@ -301,4 +301,4 @@ fi 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 60825b8..90fa336 100644 --- a/NextcloudRestore.sh +++ b/NextcloudRestore.sh @@ -3,7 +3,7 @@ # # 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) @@ -34,7 +34,7 @@ backupMainDir=${2:-} 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" @@ -46,7 +46,7 @@ useCompression=true # 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' diff --git a/setup.sh b/setup.sh index ed29c3e..43fcee4 100755 --- a/setup.sh +++ b/setup.sh @@ -3,7 +3,7 @@ # # 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 @@ -104,8 +104,8 @@ echo "Modifying NextcloudBackup.sh and NextcloudRestore.sh to match your install 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 @@ -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 "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 -- 2.34.1