asif/NextCloudBackup
1
0
Fork 0
Code Issues Pull Requests Releases 2 Activity

Changed all warning indexes to include timestamps

Browse Source
This commit is contained in:
Asif Bacchus 2018-10-23 05:09:48 -06:00
parent 6eaad32096
commit 843edfff8e
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
root/NCscripts/backup.sh
View File

@ -162,7 +162,7 @@ function cleanup {
checkResult="$?" checkResult="$?"
if [ "$checkResult" = "0" ]; then if [ "$checkResult" = "0" ]; then
# directory still exists # directory still exists
exitWarn+=('111') exitWarn+=("${stamp}_111")
else else
# directory removed # directory removed
echo -e "${op}${stamp} Removed SQL temp directory${normal}" \ echo -e "${op}${stamp} Removed SQL temp directory${normal}" \
@ -180,7 +180,7 @@ function cleanup {
checkResult="$?" checkResult="$?"
if [ "$checkResult" = "0" ]; then if [ "$checkResult" = "0" ]; then
# file still exists # file still exists
exitWarn+=('5030') exitWarn+=("${stamp}_5030")
else else
# file removed # file removed
echo -e "${info}${stamp} -- [INFO] 503 page removed from webroot" \ echo -e "${info}${stamp} -- [INFO] 503 page removed from webroot" \
@ -453,7 +453,7 @@ if [ -z "$webroot" ]; then
# no webroot path provided # no webroot path provided
echo -e "${info}${stamp} -- [INFO] ${warn503} --${normal}" \ echo -e "${info}${stamp} -- [INFO] ${warn503} --${normal}" \
>> "$logFile" >> "$logFile"
exitWarn+=('5031') exitWarn+=("${stamp}_5031")
clean503=0 clean503=0
else else
# verify webroot actually exists # verify webroot actually exists
@ -463,7 +463,7 @@ else
# webroot directory specified could not be found # webroot directory specified could not be found
echo -e "${info}${stamp} -- [INFO] ${warn503} --${normal}" \ echo -e "${info}${stamp} -- [INFO] ${warn503} --${normal}" \
>> "$logFile" >> "$logFile"
exitWarn+=('5032') exitWarn+=("{$stamp}_5032")
clean503=0 clean503=0
else else
# webroot exists # webroot exists
@ -476,7 +476,7 @@ else
# 503 file could not be found # 503 file could not be found
echo -e "${info}${stamp} -- [INFO] ${warn503} --${normal}" \ echo -e "${info}${stamp} -- [INFO] ${warn503} --${normal}" \
>> "$logFile" >> "$logFile"
exitWarn+=('5033') exitWarn+=("${stamp}_5033")
clean503=0 clean503=0
else else
# 503 file exists and webroot is valid. Let's copy it! # 503 file exists and webroot is valid. Let's copy it!
@ -491,7 +491,7 @@ else
# copy was unsuccessful # copy was unsuccessful
echo -e "${info}${stamp} -- [INFO] ${warn503} --${normal}" \ echo -e "${info}${stamp} -- [INFO] ${warn503} --${normal}" \
>> "$logFile" >> "$logFile"
exitWarn+=('5035') exitWarn+=("${stamp}_5035")
clean503=0 clean503=0
else else
# copy was successful # copy was successful
@ -599,7 +599,7 @@ if [ -n "${borgConfig[3]}" ]; then
echo -e "${op}${stamp} Borg SSH/REPO password... OK${normal}" >> "$logFile" echo -e "${op}${stamp} Borg SSH/REPO password... OK${normal}" >> "$logFile"
export BORG_PASSPHRASE="${borgConfig[3]}" export BORG_PASSPHRASE="${borgConfig[3]}"
else else
exitWarn+=('2111') exitWarn+=("${stamp}_2111")
# if the password was omitted by mistake, export a dummy password so borg # if the password was omitted by mistake, export a dummy password so borg
# fails with an error instead of sitting and waiting for input # fails with an error instead of sitting and waiting for input
export BORG_PASSPHRASE="DummyPasswordSoBorgFails" export BORG_PASSPHRASE="DummyPasswordSoBorgFails"
@ -615,7 +615,7 @@ if [ -n "${borgConfig[7]}" ]; then
echo -e "${op}${stamp} Borg REMOTE path... OK${normal}" >> "$logFile" echo -e "${op}${stamp} Borg REMOTE path... OK${normal}" >> "$logFile"
export BORG_REMOTE_PATH="${borgConfig[7]}" export BORG_REMOTE_PATH="${borgConfig[7]}"
else else
exitWarn+=('2112') exitWarn+=("${stamp}_2112")
fi fi
## If borgXtra exists, map contents to an array variable ## If borgXtra exists, map contents to an array variable
@ -630,13 +630,13 @@ if [ -n "$borgXtra" ]; then
echo -e "${op}${stamp} Processed extra files list for inclusion in" \ echo -e "${op}${stamp} Processed extra files list for inclusion in" \
"borgbackup${normal}" >> "$logFile" "borgbackup${normal}" >> "$logFile"
else else
exitWarn+=('2113') exitWarn+=("${stamp}_2113")
fi fi
else else
# no extra locations specified # no extra locations specified
echo -e "${op}${stamp} No additional locations specified for backup." \ echo -e "${op}${stamp} No additional locations specified for backup." \
"Only NextCloud data files will be backed up${normal}" >> "$logFile" "Only NextCloud data files will be backed up${normal}" >> "$logFile"
exitWarn+=('2116') exitWarn+=("${stamp}_2116")
fi fi
## Check if borgExclude exists since borg will throw an error if it's missing ## Check if borgExclude exists since borg will throw an error if it's missing
@ -650,7 +650,7 @@ if [ -n "$borgExclude" ]; then
# file not found, unset the variable so it's like it was not specified # file not found, unset the variable so it's like it was not specified
# in the first place and continue with backup # in the first place and continue with backup
unset borgExclude unset borgExclude
exitWarn+=('2114') exitWarn+=("${stamp}_2114")
fi fi
else else
echo -e "${op}${stamp} Exclusion pattern file not specified." \ echo -e "${op}${stamp} Exclusion pattern file not specified." \
@ -722,13 +722,13 @@ if [ "$borgResult" -eq 0 ]; then
echo -e "${ok}${stamp} -- [SUCCESS] Borg backup completed successfully --" \ echo -e "${ok}${stamp} -- [SUCCESS] Borg backup completed successfully --" \
"${normal}" >> "$logFile" "${normal}" >> "$logFile"
elif [ "$borgResult" -eq 1 ]; then elif [ "$borgResult" -eq 1 ]; then
exitWarn+=('2200') exitWarn+=("${stamp}_2200")
elif [ "$borgResult" -ge 2 ]; then elif [ "$borgResult" -ge 2 ]; then
exitError+=('220') exitError+=('220')
cleanup cleanup
quit quit
else else
exitWarn+=('2201') exitWarn+=("${stamp}_2201")
fi fi
## Generate and execute borg prune ## Generate and execute borg prune
@ -745,15 +745,15 @@ if [ -n "$borgPrune" ]; then
echo -e "${ok}${stamp} -- [SUCCESS] Borg prune completed successfully" \ echo -e "${ok}${stamp} -- [SUCCESS] Borg prune completed successfully" \
"--${normal}" >> "$logFile" "--${normal}" >> "$logFile"
elif [ "$pruneResult" -eq 1 ]; then elif [ "$pruneResult" -eq 1 ]; then
exitWarn+=('2210') exitWarn+=("${stamp}_2210")
elif [ "$pruneResult" -ge 2 ]; then elif [ "$pruneResult" -ge 2 ]; then
exitError+=('221') exitError+=('221')
else else
exitWarn+=('2212') exitWarn+=("${stamp}_2212")
fi fi
else else
# parameters not defined... skip pruning # parameters not defined... skip pruning
exitWarn+=('2115') exitWarn+=("${stamp}_2115")
fi fi