evolix/evomaintenance
21
0
Fork 0
Code Issues 10 Pull requests 2 Releases 6 Wiki Activity

Support de HOSTNAME_INTERNAL

Browse source
This commit is contained in:
Jérémy Lecour 2018-09-20 14:25:16 +02:00 committed by Jérémy Lecour
parent fe0eccd53a
commit 4a8e5d89e5
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
evomaintenance.cf
View file

@ -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

19
evomaintenance.sh
View file

@ -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}