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

503: Updated warning text for consistency.

Browse Source
This commit is contained in:
Asif Bacchus 2018-09-06 02:58:26 -06:00
parent 1dfaf9addc
commit a4a4e2fd08
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
root/scripts/borgbackup.sh
View File

@ -248,16 +248,16 @@ checkExist find warn $err503FullPath
checkResult="$?" checkResult="$?"
if [ "$checkResult" = "2" ]; then if [ "$checkResult" = "2" ]; then
# file not found, issue warning # file not found, issue warning
echo -e "\e[1;33m--Warning-- The 503 file should be re-created" \ echo -e "\e[1;33m--WARNING: The 503 file should be re-created" \
"ASAP." >> $logFile "ASAP.--" >> $logFile
echo -e "\e[1;33m--Warning-- Web users will NOT be notified the" \ echo -e "\e[1;33m--WARNING: Web users will NOT be notified the" \
"server is down.\e[0m" >> $logFile "server is down.--\e[0m" >> $logFile
echo -e "Script will continue processing..." >> $logFile echo -e "Script will continue processing..." >> $logFile
else else
# file found, copy it to webroot # file found, copy it to webroot
echo -e "\e[1;36m[`date +%Y-%m-%d` `date +%H:%M:%S`] Copying 503 error" \ echo -e "\e[1;36m[`date +%Y-%m-%d` `date +%H:%M:%S`] Copying 503 error" \
"page to NGINX webroot..." | tee -a $logFileVerbose $logFileNormal \ "page to NGINX webroot...\e[0m" | tee -a $logFileVerbose \
> /dev/null $logFileNormal > /dev/null
cp $err503FullPath $webroot/ 2>&1 | tee -a $logFileVerbose $logFileNormal \ cp $err503FullPath $webroot/ 2>&1 | tee -a $logFileVerbose $logFileNormal \
> /dev/null > /dev/null
echo -e "\e[0;36m...done\e[0m" | tee -a $logFileVerbose $logFileNormal \ echo -e "\e[0;36m...done\e[0m" | tee -a $logFileVerbose $logFileNormal \
@ -267,11 +267,11 @@ else
checkResult="$?" checkResult="$?"
if [ "$checkResult" = "2" ]; then if [ "$checkResult" = "2" ]; then
# file not found, issue warning # file not found, issue warning
echo -e "\e[1;33m[`date +%Y-%m-%d` `date +%H:%M:%S`] --Warning--" \ echo -e "\e[1;33m[`date +%Y-%m-%d` `date +%H:%M:%S`] --WARNING: " \
"There was a problem copying the 503 error page to" \ "There was a problem copying the 503 error page to" \
"webroot." >> $logFile "webroot.--\e[0m" >> $logFile
echo -e "\e[1;33m--Warning-- Web users will NOT be notified the" \ echo -e "\e[1;33m--WARNING: Web users will NOT be notified the" \
"server is down.\e[0m" >> $logFile "server is down.--\e[0m" >> $logFile
echo -e "Script will continue processing..." >> $logFile echo -e "Script will continue processing..." >> $logFile
fi fi
fi fi