diff --git a/root/scripts/borgbackup.sh b/root/scripts/borgbackup.sh index 9614099..e51a31a 100755 --- a/root/scripts/borgbackup.sh +++ b/root/scripts/borgbackup.sh @@ -382,15 +382,20 @@ fi ## Remove 503 error page from webroot so NGINX serves web clients again echo -e "\e[1;36m[`date +%Y-%m-%d` `date +%H:%M:%S`] Removing 503 error page" \ - "from webroot...\e[0m" >> $logFile -rm -f "$webroot/$err503FileName" &>> $logFile + "from webroot...\e[0m" | tee -a $logFileVerbose $logFileNormal > /dev/null +rm -f "$webroot/$err503FileName" 2>&1 | tee -a $logFileVerbose $logFileNormal \ + > /dev/null +echo -e "\e[0;36m...done\e[0m" # verify actually removed -if [ -e "$webroot/$err503FileName" ]; then - echo -e "\e[1;33m[`date +%Y-%m-%d` `date +%H:%M:%S`] --Warning--" \ - "Error removing 503 error page from webroot." >> $logFile - echo -e "--Warning-- NGINX will NOT server webclients until this file is" \ - "removed.\e[0m" >> $logFile +checkExist find "" "$webroot/$err503FileName" +checkResult="$?" +if [ "$checkResult" = "0" ]; then + echo -e "\e[1;33m[`date +%Y-%m-%d` `date +%H:%M:%S`] --WARNING:" \ + "Problem encountered removing 503 error page from webroot." \ + "Manually remove this file to allow NGINX to serve web" \ + "clients.--" >> $logFile echo -e "Script will continue processing..." >> $logFile + exitWarning+=('103') else echo -e "\e[0;36m...done\e[0m" >> $logFile fi