From 82dffd5b1d1e5ac8b982b7b51b71b1995ab0d2f4 Mon Sep 17 00:00:00 2001
From: Tyler Hale <tyler@haletek.com>
Date: Sat, 25 Jan 2025 17:02:45 -0700
Subject: [PATCH] Updating MOTD

---
 roles/base/templates/motd.j2 | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/roles/base/templates/motd.j2 b/roles/base/templates/motd.j2
index fd7e6ec..319a4f9 100644
--- a/roles/base/templates/motd.j2
+++ b/roles/base/templates/motd.j2
@@ -20,6 +20,10 @@ PROCESSES=`ps ax | wc -l | tr -d " "`
 SWAPSTAT=`free -m | tail -n 1 | awk '{print $3}'`
 USAGEROOT=`df -Ph | grep /$ | awk '{print $5 " of " $2}'`
 IPADDRESSES=`ip a|grep -oP "inet \K[0-9.]*(?=.*[^ ][^l][^o]$)"`
+if (( $(grep -c . <<<"$IPADDRESSES") > 1 )); then
+  IPs=$(sed -e "s/^/   - /" <<< $IPADDRESSES)
+  IPADDRESSES=$'\n'$IPs
+fi
 
 {% if base_core_motd_banner != '' %}
 BANNER='
@@ -31,18 +35,19 @@ echo "$BANNER
 {% else %}
 echo "*********************************************************************
 {% endif %}
- - Hostname............: $HOSTNAME
- - Operating System....: $OSVERSION
- - Uptime..............: $UPTIMEP
- - Current Time........: $CURRENTTIME
- - Boot Time...........: $BOOTTIME
- - Logged on users.....: $CONNECTEDUSERS
+- Hostname............: $HOSTNAME
+- Operating System....: $OSVERSION
+- Uptime..............: $UPTIMEP
+- Current Time........: $CURRENTTIME
+- Boot Time...........: $BOOTTIME
+- Login Sessions......: $CONNECTEDUSERS
+$(who | sed "s/^/   - /")
 *********************************************************************
- - Running Processes...: $PROCESSES
- - CPU usage...........: $LOAD1, $LOAD5, $LOAD15 (1, 5, 15 min)
- - Memory usage........: $MEMORY1 / $MEMORY2 ($MEMORY4%)
- - Swap in use.........: $SWAPSTAT MB
- - Usage of /..........: $USAGEROOT
- - IP Addresses........: $IPADDRESSES
+- Running Processes...: $PROCESSES
+- CPU usage...........: $LOAD1, $LOAD5, $LOAD15 (1, 5, 15 min)
+- Memory usage........: $MEMORY1 / $MEMORY2 ($MEMORY4%)
+- Swap in use.........: $SWAPSTAT MB
+- Usage of /..........: $USAGEROOT
+- IP Addresses........: $IPADDRESSES
 *********************************************************************
 "