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

use logname(1) instead of USER or SUDO_USER

Browse source
This commit is contained in:
Jérémy Lecour 2018-09-04 23:35:21 +02:00
parent d3ffbc8225
commit 5a0603430a
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
evomaintenance.sh
View file

@ -15,7 +15,7 @@ test -f /etc/evomaintenance.cf && . /etc/evomaintenance.cf
PATH=${PATH}:/usr/sbin
# get ipaddress
USER=$(logname)
BEGIN_YEAR=$(date "+%Y")
@ -23,13 +23,15 @@ SYSTEME=$(uname -s)
if [ "${SYSTEME}" = "Linux" ]; then
IP=$(LC_ALL=C who | grep $(ps -o tty= | tail -1) | tr -s ' ' | cut -d" " -f6 | sed -e "s/^(// ; s/)$//")
BEGIN_DATE=$(LC_ALL=C who | grep $(ps -o tty= | tail -1) | tr -s ' ' | cut -d" " -f3,4,5)
_USER=${SUDO_USER}
LOGFILE_PERMS="root:adm"
elif [ "${SYSTEME}" = "OpenBSD" ]; then
IP=$(LC_ALL=C who | grep $(env | grep SSH_TTY | cut -d"/" -f3) | tr -s ' ' | cut -d" " -f6 | sed -e "s/^(// ; s/)$//")
BEGIN_DATE=$(LC_ALL=C who | grep $(env | grep SSH_TTY | cut -d"/" -f3) | tr -s ' ' | cut -d" " -f3,4,5)
_USER=${USER}
LOGFILE_PERMS="root:wheel"
else
echo "OS not detected!"
@ -55,7 +57,7 @@ fi
# recapitulatif
echo "hostname = ${HOSTNAME}"
echo "user = ${_USER}"
echo "user = ${USER}"
echo "IP = ${IP}"
echo "begin date = ${BEGIN_YEAR} ${BEGIN_DATE}"
echo "details = ${TEXTE}"
@ -66,7 +68,7 @@ read enter
# write log
LOG_TEXTE=$(echo "${TEXTE}" | sed 's/"/\\\"/g')
echo "${NOW} hostname=\"${HOSTNAME}\" user=\"${SUDO_USER}\" ip=\"${IP}\" begin_date=\"${BEGIN_YEAR} ${BEGIN_DATE}\" message=\"${LOG_TEXTE}\"" >> "${LOGFILE}"
echo "${NOW} hostname=\"${HOSTNAME}\" user=\"${USER}\" ip=\"${IP}\" begin_date=\"${BEGIN_YEAR} ${BEGIN_DATE}\" message=\"${LOG_TEXTE}\"" >> "${LOGFILE}"
# git commit
GIT_BIN=$(command -v git)
@ -74,7 +76,7 @@ GIT_BIN=$(command -v git)
if test -x "${GIT_BIN}"; then
export GIT_DIR=/etc/.git
${GIT_BIN} add .
${GIT_BIN} commit --all --message "${LOG_TEXTE}" --author="${_USER} <${_USER}@evolix.net>" --quiet
${GIT_BIN} commit --all --message "${LOG_TEXTE}" --author="${USER} <${USER}@evolix.net>" --quiet
fi
# insert into PG
@ -82,12 +84,12 @@ 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_YEAR} ${BEGIN_DATE}',now(),'${SQL_TEXTE}') " | \
VALUES ('${HOSTNAME}','${USER}','${IP}','${BEGIN_YEAR} ${BEGIN_DATE}',now(),'${SQL_TEXTE}') " | \
psql ${PGDB} ${PGTABLE} -h ${PGHOST}
# send mail
SENDMAIL=$(command -v sendmail)
cat /usr/share/scripts/evomaintenance.tpl | \
sed -e "s/__TO__/${EVOMAINTMAIL}/ ; s/__HOSTNAME__/${HOSTNAME}/ ; s/__USER__/${_USER}/ ; s/__BEGIN_DATE__/${BEGIN_YEAR} ${BEGIN_DATE}/ ; s/__TEXTE__/${TEXTE}/ ; s/__IP__/${IP}/ ; s/__FULLFROM__/${FULLFROM}/ ; s/__FROM__/${FROM}/ ; s/__URGENCYFROM__/${URGENCYFROM}/ ; s/__URGENCYTEL__/${URGENCYTEL}/" | \
sed -e "s/__TO__/${EVOMAINTMAIL}/ ; s/__HOSTNAME__/${HOSTNAME}/ ; s/__USER__/${USER}/ ; s/__BEGIN_DATE__/${BEGIN_YEAR} ${BEGIN_DATE}/ ; s/__TEXTE__/${TEXTE}/ ; s/__IP__/${IP}/ ; s/__FULLFROM__/${FULLFROM}/ ; s/__FROM__/${FROM}/ ; s/__URGENCYFROM__/${URGENCYFROM}/ ; s/__URGENCYTEL__/${URGENCYTEL}/" | \
${SENDMAIL} -oi -t -f ${FROM}