From 5fa7282b2f42e7836f0cdb60e13fbd11857818e2 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Thu, 20 Sep 2018 16:10:03 +0200
Subject: [PATCH] Pas beosin d'une nouvelle variable pour le hostname
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Celui stocké dans evomaintenance.cf est celui qui compte pour l'interne.
Le vrai hostname est toujours détectable.
---
 evomaintenance.cf |  5 ++---
 evomaintenance.sh | 14 +++++++-------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/evomaintenance.cf b/evomaintenance.cf
index 2b50980..f388238 100644
--- a/evomaintenance.cf
+++ b/evomaintenance.cf
@@ -1,8 +1,7 @@
 # Configuration for evomaintenance 
 
-#HOSTNAME=your-hostname
-#HOSTNAME_INTERNAL=your-internal-hostname
-#EVOMAINTMAIL=evomaintenance-your-hostname@example.com
+#HOSTNAME=your-host
+#EVOMAINTMAIL=evomaintenance-your-host@example.com
 
 export PGPASSWORD=your-passwd
 
diff --git a/evomaintenance.sh b/evomaintenance.sh
index 0fae615..e16e96a 100644
--- a/evomaintenance.sh
+++ b/evomaintenance.sh
@@ -9,19 +9,19 @@
 
 test -f /etc/evomaintenance.cf && . /etc/evomaintenance.cf
 
-[ -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
+[ -n "${HOSTNAME}" ]     || HOSTNAME=$(hostname --fqdn)
+[ -n "${EVOMAINTMAIL}" ] || EVOMAINTMAIL=evomaintenance-$(echo "${HOSTNAME}" | cut -d- -f1)@${REALM}
+[ -n "${LOGFILE}" ]      || LOGFILE=/var/log/evomaintenance.log
 
 # Treat unset variables as an error when substituting.
 # Only after this line, because some config variables might be missing.
 set -u
 
-if [ "${HOSTNAME}" = "${HOSTNAME_INTERNAL}" ]; then
+REAL_HOSTNAME=$(hostname --fqdn)
+if [ "${HOSTNAME}" = "${REAL_HOSTNAME}" ]; then
     HOSTNAME_TEXT="${HOSTNAME}"
 else
-    HOSTNAME_TEXT="${HOSTNAME_INTERNAL} (${HOSTNAME})"
+    HOSTNAME_TEXT="${HOSTNAME} (${REAL_HOSTNAME})"
 fi
 
 PATH=${PATH}:/usr/sbin
@@ -129,7 +129,7 @@ fi
 # SQL_TEXTE=`echo "${TEXTE}" | sed "s/'/\\\\\\'/g ; s@/@\\\\\/@g ; s@\\&@et@g"`
 SQL_TEXTE=`echo "${TEXTE}" | sed "s/'/''/g"`
 
-PG_QUERY="INSERT INTO evomaint(hostname,userid,ipaddress,begin_date,end_date,details) VALUES ('${HOSTNAME_INTERNAL}','${USER}','${IP}','${BEGIN_DATE}',now(),'${SQL_TEXTE}')"
+PG_QUERY="INSERT INTO evomaint(hostname,userid,ipaddress,begin_date,end_date,details) VALUES ('${HOSTNAME}','${USER}','${IP}','${BEGIN_DATE}',now(),'${SQL_TEXTE}')"
 echo "${PG_QUERY}" | psql ${PGDB} ${PGTABLE} -h ${PGHOST}
 
 # send mail