Merge branch 'master' into develop

This commit is contained in:
Matthew McKinnon 2015-10-14 00:06:10 +10:00
commit 8cf21f1dcb
3 changed files with 3 additions and 3 deletions

View File

@ -140,7 +140,7 @@ See the logfile for more info: vim $LOGFILE
Regards. " >/tmp/servermail.msg Regards. " >/tmp/servermail.msg
cat /tmp/servermail.msg | sendemail -s $SMTP -t $MAILTO -f "$THISSERVER <$MAILTO>" -u "[$THISSERVER] server may need some updates applied" cat /tmp/servermail.msg | sendemail -o tls=no -s $SMTP -t $MAILTO -f "$THISSERVER <$MAILTO>" -u "[$THISSERVER] server may need some updates applied"
echo "`date` [MESSAGE] Packages need updating email sent to $MAILTO" >> $LOGFILE echo "`date` [MESSAGE] Packages need updating email sent to $MAILTO" >> $LOGFILE
fi fi

View File

@ -53,7 +53,7 @@ See the logfile for more info: vim $LOGFILE
Regards, " >/tmp/diskalertmail.msg Regards, " >/tmp/diskalertmail.msg
cat /tmp/diskalertmail.msg | sendemail -s $SMTP -t $MAILTO -f "$THISSERVER <$MAILTO>" -u "[$THISSERVER] is running out of disk space" cat /tmp/diskalertmail.msg | sendemail -o tls=no -s $SMTP -t $MAILTO -f "$THISSERVER <$MAILTO>" -u "[$THISSERVER] is running out of disk space"
echo "`date` [MESSAGE] Running out of disk space email sent to $MAILTO" >> $LOGFILE echo "`date` [MESSAGE] Running out of disk space email sent to $MAILTO" >> $LOGFILE
fi fi

View File

@ -24,7 +24,7 @@ echo "****************************************************************" >> $LOG
echo "* Finished Backup `date` *" >> $LOG 2>&1 echo "* Finished Backup `date` *" >> $LOG 2>&1
echo "****************************************************************" >> $LOG 2>&1 echo "****************************************************************" >> $LOG 2>&1
sendemail -f "NAS BACKUP <$FROMADDRESS>" -t $TOADDRESS -u "$BODSUBJECT" -m "$BODSUBJECT" -a $LOG -s $SMTP >> $LOG 2>&1 sendemail -o tls=no -f "NAS BACKUP <$FROMADDRESS>" -t $TOADDRESS -u "$BODSUBJECT" -m "$BODSUBJECT" -a $LOG -s $SMTP >> $LOG 2>&1
find $LOGFOLDER/* -mtime +$N_DAYS -exec rm {} \; find $LOGFOLDER/* -mtime +$N_DAYS -exec rm {} \;