asif/MailcowBackup
1
0
Fork 0
Code Issues Releases 10 Wiki Activity

Compare commits

base: asif/MailcowBackup:3a3b02685bc3fd3f91cfd47a05614b779331dd51
Branches Tags
asif/MailcowBackup:main asif/MailcowBackup:v4
asif/MailcowBackup:MailcowBackupV4.0.0 asif/MailcowBackup:MailcowBackupV3.5.1 asif/MailcowBackup:MailcowBackupV3.5 asif/MailcowBackup:MailcowBackupV3.1.1 asif/MailcowBackup:MailcowBackupV3.1 asif/MailcowBackup:MailcowBackupV3.0 asif/MailcowBackup:MailcowBackupV2.0 asif/MailcowBackup:MailcowBackupV1.5.1 asif/MailcowBackup:MailcowBackupV1.5 asif/MailcowBackup:MailcowBackupV1.1.1
..
compare: asif/MailcowBackup:MailcowBackupV3.1
Branches Tags
asif/MailcowBackup:main asif/MailcowBackup:v4
asif/MailcowBackup:MailcowBackupV4.0.0 asif/MailcowBackup:MailcowBackupV3.5.1 asif/MailcowBackup:MailcowBackupV3.5 asif/MailcowBackup:MailcowBackupV3.1.1 asif/MailcowBackup:MailcowBackupV3.1 asif/MailcowBackup:MailcowBackupV3.0 asif/MailcowBackup:MailcowBackupV2.0 asif/MailcowBackup:MailcowBackupV1.5.1 asif/MailcowBackup:MailcowBackupV1.5 asif/MailcowBackup:MailcowBackupV1.1.1

3 Commits
3a3b02685b .. MailcowBackupV3.1

Author SHA1 Message Date
Asif Bacchus f2231c7074 fix(BACKUP): change borg cmd 
- place common-options after borg command verb
- thanks to lluis

Closes github 7
 2021-02-09 16:56:38 -07:00
Asif Bacchus 2747b10040 docs(RESTORE): remove misleading copied comments 2021-02-09 14:59:59 -07:00
Asif Bacchus 876f8eee9e fix(RESTORE): fix restore path when non-verbose 
- non-verbose tar extraction was set to null path
 2021-02-09 14:58:50 -07:00
2 changed files with 3 additions and 6 deletions
Expand all files Collapse all files
backup/backup.sh
+2 -2
View File
@@ -690,7 +690,7 @@ printf "%s[%s] -- [INFO] Pre-backup tasks completed, calling borgbackup --%s\n"
## construct the proper borg commandline ## construct the proper borg commandline
# base command # base command
if [ "$exclusions" -eq 0 ]; then if [ "$exclusions" -eq 0 ]; then
borgCMD="borg --show-rc create ${borgCreateParams} \ borgCMD="borg create --show-rc ${borgCreateParams} \
::$(date +%Y-%m-%d_%H%M%S) \ ::$(date +%Y-%m-%d_%H%M%S) \
${mcConfig%/*} \ ${mcConfig%/*} \
${sqlDumpDir} \ ${sqlDumpDir} \
@@ -701,7 +701,7 @@ if [ "$exclusions" -eq 0 ]; then
${dockerVolumeCrypt} \ ${dockerVolumeCrypt} \
${xtraList}" ${xtraList}"
elif [ "$exclusions" -eq 1 ]; then elif [ "$exclusions" -eq 1 ]; then
borgCMD="borg --show-rc create ${borgCreateParams} \ borgCMD="borg create --show-rc ${borgCreateParams} \
--exclude-from ${borgExcludeListPath} \ --exclude-from ${borgExcludeListPath} \
::$(date +%Y-%m-%d_%H%M%S) \ ::$(date +%Y-%m-%d_%H%M%S) \
${mcConfig%/*} \ ${mcConfig%/*} \
backup/restore.sh
+1 -4
View File
@@ -57,7 +57,7 @@ doRestore() {
return 0 return 0
fi fi
else else
if (! (cd "$sourceFiles/_data" && tar -cf - .) | (cd "${3}" && tar xvf -) > /dev/null 2>&1 ); then if (! (cd "$sourceFiles/_data" && tar -cf - .) | (cd "${2}" && tar xvf -) > /dev/null 2>&1 ); then
return 1 return 1
else else
return 0 return 0
@@ -500,7 +500,6 @@ if [ "$restorePostfix" -eq 1 ]; then
writeLog 'task' "Restoring postfix files" writeLog 'task' "Restoring postfix files"
fi fi
# restore email messages
doRestore "${COMPOSE_PROJECT_NAME}_postfix-vol-1" "$dockerVolumePostfix"; ec="$?" doRestore "${COMPOSE_PROJECT_NAME}_postfix-vol-1" "$dockerVolumePostfix"; ec="$?"
case "$ec" in case "$ec" in
0) 0)
@@ -537,7 +536,6 @@ if [ "$restoreRspamd" -eq 1 ]; then
writeLog 'task' "Restoring Rspamd files" writeLog 'task' "Restoring Rspamd files"
fi fi
# restore email messages
doRestore "${COMPOSE_PROJECT_NAME}_rspamd-vol-1" "$dockerVolumeRspamd"; ec="$?" doRestore "${COMPOSE_PROJECT_NAME}_rspamd-vol-1" "$dockerVolumeRspamd"; ec="$?"
case "$ec" in case "$ec" in
0) 0)
@@ -574,7 +572,6 @@ if [ "$restoreRedis" -eq 1 ]; then
writeLog 'task' "Restoring redis database" writeLog 'task' "Restoring redis database"
fi fi
# restore email messages
doRestore "${COMPOSE_PROJECT_NAME}_redis-vol-1" "$dockerVolumeRedis"; ec="$?" doRestore "${COMPOSE_PROJECT_NAME}_redis-vol-1" "$dockerVolumeRedis"; ec="$?"
case "$ec" in case "$ec" in
0) 0)