include fqdn hostname in msgid

[code/fbi-announce.git] / fbi-announce.sh

diff --git a/fbi-announce.sh b/fbi-announce.sh
index b7f06921c6332b09970c76f0db2778ccb8a59b64..d8542e898b1b356c180bf47d95cd7481313351fc 100755 (executable)
--- a/fbi-announce.sh
+++ b/fbi-announce.sh
@@ -58,7 +58,7 @@ from=$(git config hooks.fbi-emailsender 2>/dev/null ||:)
 to="commit@commit.ganneff.de" #TODO: possibly factor out to config
 
 # mail submission client to use
 to="commit@commit.ganneff.de" #TODO: possibly factor out to config
 
 # mail submission client to use

-if [ -n "$FBI_ANNOUNCE_TO_STDOUT" ]; then
+if [ -n "${FBI_ANNOUNCE_TO_STDOUT:-}" ]; then

   sendmail="cat"
   echo >&2 'I: outputting to stdout since $FBI_ANNOUNCE_TO_STDOUT is set.'
 else
   sendmail="cat"
   echo >&2 'I: outputting to stdout since $FBI_ANNOUNCE_TO_STDOUT is set.'
 else


@@ -99,7 +99,7 @@ ${sendmail} <<_eom
 ${from:+From: ${from}
 }To: ${to}
 Subject: Announce ${project}
 ${from:+From: ${from}
 }To: ${to}
 Subject: Announce ${project}

-Message-Id: <fbi-announce.${ref}@${project}>
+Message-Id: <fbi-announce.${project}.${ref}@$(hostname --fqdn)>

 
 ${msg}
 _eom
 
 ${msg}
 _eom