Commit ae51c313 authored by ics's avatar ics

add from sci@ill.fr to mail command

parent e5beb9ef
......@@ -112,7 +112,7 @@ sendmail() {
state="exit"
fi
mail -s "[$USER][server][$state] $1" $NOMAD_MAIL < $TEMP_FILE
mail -s "[$USER][server][$state] $1" -r sci@ill.fr $NOMAD_MAIL < $TEMP_FILE
# send to local contact mailing list
MAILING_LIST_FILE="$HOME/.nomadserver/mailingList.txt"
......@@ -125,7 +125,7 @@ sendmail() {
TEMP_FILE2="$HOME/log/tmp2.txt"
echo " " >> $TEMP_FILE2
echo "send mail to $addresses"
mail -s "[$USER] Nomad server crash" $addresses < $TEMP_FILE2
mail -s "[$USER] Nomad server crash" -r sci@ill.fr $addresses < $TEMP_FILE2
rm $TEMP_FILE2
fi
......
......@@ -300,7 +300,7 @@ void Condition::notify() {
// mail
if (_mailRecipients != "") {
string mailCommand("echo \"");
mailCommand += _message + "\" | mail -s \"";
mailCommand += _message + "\" | mail -r sci@ill.fr -s \"";
mailCommand += getNotificationSubject() + " on `hostname --long`\" ";
string recipients = _mailRecipients;
......@@ -330,7 +330,7 @@ void Condition::notify() {
for (vector<string>::const_iterator n = numbers.begin(); n != numbers.end(); ++n) {
string mailCommand("echo \"");
mailCommand += getNotificationSubject() + " on `hostname --long`:\n" + _message + "\" | mail -s \"";
mailCommand += getNotificationSubject() + " on `hostname --long`:\n" + _message + "\" | mail -r sci@ill.fr -s \"";
mailCommand += *n + "\"";
// temp
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment