Pas beosin d'une nouvelle variable pour le hostname
Celui stocké dans evomaintenance.cf est celui qui compte pour l'interne. Le vrai hostname est toujours détectable.
This commit is contained in:
parent
6e377cedca
commit
5fa7282b2f
|
@ -1,8 +1,7 @@
|
||||||
# Configuration for evomaintenance
|
# Configuration for evomaintenance
|
||||||
|
|
||||||
#HOSTNAME=your-hostname
|
#HOSTNAME=your-host
|
||||||
#HOSTNAME_INTERNAL=your-internal-hostname
|
#EVOMAINTMAIL=evomaintenance-your-host@example.com
|
||||||
#EVOMAINTMAIL=evomaintenance-your-hostname@example.com
|
|
||||||
|
|
||||||
export PGPASSWORD=your-passwd
|
export PGPASSWORD=your-passwd
|
||||||
|
|
||||||
|
|
|
@ -9,19 +9,19 @@
|
||||||
|
|
||||||
test -f /etc/evomaintenance.cf && . /etc/evomaintenance.cf
|
test -f /etc/evomaintenance.cf && . /etc/evomaintenance.cf
|
||||||
|
|
||||||
[ -n "${HOSTNAME}" ] || HOSTNAME=$(hostname)
|
[ -n "${HOSTNAME}" ] || HOSTNAME=$(hostname --fqdn)
|
||||||
[ -n "${HOSTNAME_INTERNAL}" ] || HOSTNAME_INTERNAL="${HOSTNAME}"
|
[ -n "${EVOMAINTMAIL}" ] || EVOMAINTMAIL=evomaintenance-$(echo "${HOSTNAME}" | cut -d- -f1)@${REALM}
|
||||||
[ -n "${EVOMAINTMAIL}" ] || EVOMAINTMAIL=evomaintenance-$(echo "${HOSTNAME_INTERNAL}" | cut -d- -f1)@${REALM}
|
[ -n "${LOGFILE}" ] || LOGFILE=/var/log/evomaintenance.log
|
||||||
[ -n "${LOGFILE}" ] || LOGFILE=/var/log/evomaintenance.log
|
|
||||||
|
|
||||||
# Treat unset variables as an error when substituting.
|
# Treat unset variables as an error when substituting.
|
||||||
# Only after this line, because some config variables might be missing.
|
# Only after this line, because some config variables might be missing.
|
||||||
set -u
|
set -u
|
||||||
|
|
||||||
if [ "${HOSTNAME}" = "${HOSTNAME_INTERNAL}" ]; then
|
REAL_HOSTNAME=$(hostname --fqdn)
|
||||||
|
if [ "${HOSTNAME}" = "${REAL_HOSTNAME}" ]; then
|
||||||
HOSTNAME_TEXT="${HOSTNAME}"
|
HOSTNAME_TEXT="${HOSTNAME}"
|
||||||
else
|
else
|
||||||
HOSTNAME_TEXT="${HOSTNAME_INTERNAL} (${HOSTNAME})"
|
HOSTNAME_TEXT="${HOSTNAME} (${REAL_HOSTNAME})"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
PATH=${PATH}:/usr/sbin
|
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 ; s@/@\\\\\/@g ; s@\\&@et@g"`
|
||||||
SQL_TEXTE=`echo "${TEXTE}" | sed "s/'/''/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}
|
echo "${PG_QUERY}" | psql ${PGDB} ${PGTABLE} -h ${PGHOST}
|
||||||
|
|
||||||
# send mail
|
# send mail
|
||||||
|
|
Loading…
Reference in a new issue