From 4a8e5d89e508e0996588301b01f32f4a169b9a02 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Thu, 20 Sep 2018 14:25:16 +0200
Subject: [PATCH] Support de HOSTNAME_INTERNAL

---
 evomaintenance.cf |  5 +++--
 evomaintenance.sh | 19 +++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/evomaintenance.cf b/evomaintenance.cf
index f388238..2b50980 100644
--- a/evomaintenance.cf
+++ b/evomaintenance.cf
@@ -1,7 +1,8 @@
 # Configuration for evomaintenance 
 
-#HOSTNAME=your-host
-#EVOMAINTMAIL=evomaintenance-your-host@example.com
+#HOSTNAME=your-hostname
+#HOSTNAME_INTERNAL=your-internal-hostname
+#EVOMAINTMAIL=evomaintenance-your-hostname@example.com
 
 export PGPASSWORD=your-passwd
 
diff --git a/evomaintenance.sh b/evomaintenance.sh
index 160e8b7..7e62e2a 100644
--- a/evomaintenance.sh
+++ b/evomaintenance.sh
@@ -9,9 +9,16 @@
 
 test -f /etc/evomaintenance.cf && . /etc/evomaintenance.cf
 
-[ -n "${HOSTNAME}" ]     || HOSTNAME=$(hostname)
-[ -n "${EVOMAINTMAIL}" ] || EVOMAINTMAIL=evomaintenance-$(echo "${HOSTNAME}" | cut -d- -f1)@${REALM}
-[ -n "${LOGFILE}" ]      || LOGFILE=/var/log/evomaintenance.log
+[ -n "${HOSTNAME}" ]          || HOSTNAME=$(hostname)
+[ -n "${HOSTNAME_INTERNAL}" ] || HOSTNAME_INTERNAL="${HOSTNAME}"
+[ -n "${EVOMAINTMAIL}" ]      || EVOMAINTMAIL=evomaintenance-$(echo "${HOSTNAME_INTERNAL}" | cut -d- -f1)@${REALM}
+[ -n "${LOGFILE}" ]           || LOGFILE=/var/log/evomaintenance.log
+
+if [ "${HOSTNAME}" = "${HOSTNAME_INTERNAL}" ]; then
+    HOSTNAME_TEXT="${HOSTNAME}"
+else
+    HOSTNAME_TEXT="${HOSTNAME_INTERNAL} (${HOSTNAME})"
+fi
 
 PATH=${PATH}:/usr/sbin
 
@@ -37,7 +44,7 @@ fi
 
 # recapitulatif
 BLOB=$(cat <<END
-Host      : $HOSTNAME
+Host      : $HOSTNAME_TEXT
 User      : $USER
 IP        : $IP
 Begin     : $BEGIN_DATE
@@ -88,7 +95,7 @@ SQL_TEXTE=`echo "${TEXTE}" | sed "s/'/\\\\\\'/g ; s@/@\\\\\/@g ; s@\\&@et@g"`
 
 echo "
 INSERT INTO evomaint(hostname,userid,ipaddress,begin_date,end_date,details)
-VALUES ('${HOSTNAME}','${USER}','${IP}','${BEGIN_DATE}',now(),'${SQL_TEXTE}') " | \
+VALUES ('${HOSTNAME_INTERNAL}','${USER}','${IP}','${BEGIN_DATE}',now(),'${SQL_TEXTE}') " | \
     psql ${PGDB} ${PGTABLE} -h ${PGHOST}
 
 # send mail
@@ -96,5 +103,5 @@ MAIL_TEXTE=$(echo "${TEXTE}" | sed "s@/@\\\\\/@g")
 MAIL_GIT_COMMITS=$(echo "${GIT_COMMITS}" | sed "s@/@\\\\\/@g")
 
 cat /usr/share/scripts/evomaintenance.tpl | \
-    sed -e "s/__TO__/${EVOMAINTMAIL}/ ; s/__HOSTNAME__/${HOSTNAME}/ ; s/__USER__/${USER}/ ; s/__BEGIN_DATE__/${BEGIN_DATE}/ ; s/__END_DATE__/${END_DATE}/ ; s/__GIT_COMMITS__/${MAIL_GIT_COMMITS}/ ; s/__TEXTE__/${MAIL_TEXTE}/ ; s/__IP__/${IP}/ ; s/__FULLFROM__/${FULLFROM}/ ; s/__FROM__/${FROM}/ ; s/__URGENCYFROM__/${URGENCYFROM}/ ; s/__URGENCYTEL__/${URGENCYTEL}/" | \
+    sed -e "s/__TO__/${EVOMAINTMAIL}/ ; s/__HOSTNAME__/${HOSTNAME_TEXT}/ ; s/__USER__/${USER}/ ; s/__BEGIN_DATE__/${BEGIN_DATE}/ ; s/__END_DATE__/${END_DATE}/ ; s/__GIT_COMMITS__/${MAIL_GIT_COMMITS}/ ; s/__TEXTE__/${MAIL_TEXTE}/ ; s/__IP__/${IP}/ ; s/__FULLFROM__/${FULLFROM}/ ; s/__FROM__/${FROM}/ ; s/__URGENCYFROM__/${URGENCYFROM}/ ; s/__URGENCYTEL__/${URGENCYTEL}/" | \
     ${SENDMAIL} -oi -t -f ${FROM}