diff --git a/evomaintenance.sh b/evomaintenance.sh index ba05344..78b1dc8 100755 --- a/evomaintenance.sh +++ b/evomaintenance.sh @@ -97,13 +97,22 @@ get_who() { } get_begin_date() { - printf "%s %s" "$(date "+%Y")" "$(get_who | cut -d" " -f3,4,5)" + # XXX Begin end date isn't applicable when used in autosysadmin, + # so we use the same one as the end date. + if [ "${AUTOSYSADMIN}" -eq 1 ]; then + get_end_date + else + printf "%s %s" "$(date "+%Y")" "$(get_who | cut -d" " -f3,4,5)" + fi } get_ip() { ip=$(get_who | cut -d" " -f6 | sed -e "s/^(// ; s/)$//") - [ -z "${ip}" ] && ip="unknown (no tty)" - [ "${ip}" = ":0" ] && ip="localhost" + if [ "${AUTOSYSADMIN}" -eq 1 ] || [ "${ip}" = ":0" ]; then + ip="localhost" + elif [ -z "${ip}" ]; then + ip="unknown (no tty)" + fi echo "${ip}" } @@ -116,6 +125,14 @@ get_now() { date +"%Y-%m-%dT%H:%M:%S%z" } +get_user() { + if [ "${AUTOSYSADMIN}" -eq 1 ]; then + echo autosysadmin + else + logname + fi +} + get_complete_hostname() { REAL_HOSTNAME=$(get_fqdn) if [ "${HOSTNAME}" = "${REAL_HOSTNAME}" ]; then @@ -382,6 +399,7 @@ AUTO=${AUTO:-"0"} EVOCHECK=${EVOCHECK:-"0"} GIT_STATUS_MAX_LINES=${GIT_STATUS_MAX_LINES:-20} API_ENDPOINT=${API_ENDPOINT:-""} +AUTOSYSADMIN=${AUTOSYSADMIN:-0} # initialize variables MESSAGE=""