From e601d327e2e948a3b365e926e950a6e381af0790 Mon Sep 17 00:00:00 2001
From: Bryan Roessler <bryanroessler@gmail.com>
Date: Wed, 20 Oct 2021 13:26:55 -0400
Subject: [PATCH] New motd script for CentOS 7

---
 script-install-motd    | 54 +++++++++++++++++++++++++++++++++---------
 script-user-reset-x2go |  8 ++++++-
 2 files changed, 50 insertions(+), 12 deletions(-)
 mode change 100755 => 100644 script-install-motd

diff --git a/script-install-motd b/script-install-motd
old mode 100755
new mode 100644
index 75d8fe47..9eed393d
--- a/script-install-motd
+++ b/script-install-motd
@@ -5,23 +5,55 @@
 
 is_root
 
-scripts=("10-hostname-color" "20-sysinfo" "35-diskspace" "36-diskstatus" "40-services" "50-fail2ban")
 
-git clone "https://github.com/yboetz/motd.git"
+profiledir="/etc/profile.d/"
 
-systemdir="/etc/update-mot.d"
+[[ ! -d "$profiledir" ]] && mkdir -p "$profiledir"
 
-[[ ! -d "$systemdir" ]] && mkdir -p "$systemdir"
 
-cd motd || exit $?
+cat <<- EOF > "$profiledir/motd"
+#!/usr/bin/env bash
 
-for script in "${scripts[@]}"; do
-    echo "$script"
-    cp "$script" "$systemdir"
-done
+USER=$(whoami)
+HOSTNAME=$(uname -n)
+ARRAY=$(df -Ph | grep array | awk '{print $4}' | tr -d '\n')
+ROOT=$(df -Ph | grep sdb3 | awk '{print $4}' | tr -d '\n')
+BACKUP=$(df -Ph | grep backup | awk '{print $4}' | tr -d '\n')
 
-cd ..
+MEMORY1=$(free -t -m | grep "buffers/cache" | awk '{print $3" MB";}')
+MEMORY2=$(free -t -m | grep "Mem" | awk '{print $2" MB";}')
+PSA=$(ps -Afl | wc -l)
+
+#System uptime
+uptime=$(cut -f1 -d. /proc/uptime)
+upDays=$((uptime/60/60/24))
+upHours=$((uptime/60/60%24))
+upMins=$((uptime/60%60))
+upSecs=$((uptime%60))
+
+#System load
+LOAD1=$(awk {'print $1'} /proc/loadavg)
+LOAD5=$(awk {'print $2'} /proc/loadavg)
+LOAD15=$(awk {'print $3'} /proc/loadavg)
+
+echo "
+===========================================================================
+ - Hostname............: $HOSTNAME
+ - Release.............: $(cat /etc/redhat-release)
+ - Users...............: Currently $(users | wc -w) user(s) logged on
+===========================================================================
+ - Current user........: $USER
+ - CPU usage...........: $LOAD1, $LOAD5, $LOAD15 (1, 5, 15 min)
+ - Memory used.........: $MEMORY1 / $MEMORY2
+ - Swap in use.........: $(free -m | tail -n 1 | awk '{print $3}') MB
+ - Processes...........: $PSA running
+ - System uptime.......: $upDays days $upHours hours $upMins minutes $upSecs seconds
+ - Disk space ROOT.....: $ROOT remaining
+ - Disk space ARRAY....: $ARRAY remaining
+ - Disk space BACKUP...: $BACKUP remaining
+===========================================================================
+"
+EOF
 
-rm -rf motd
 
 exit $?
\ No newline at end of file
diff --git a/script-user-reset-x2go b/script-user-reset-x2go
index 27e366c2..26bd564d 100644
--- a/script-user-reset-x2go
+++ b/script-user-reset-x2go
@@ -18,4 +18,10 @@ mapfile -t sessions < <(x2golistsessions_root | grep "$user")
 for session in "${sessions[@]}"; do
     id=${session%|*}
     x2goterminate-session "$id"
-done
\ No newline at end of file
+done
+
+exit=$?
+
+echo "X2Go sessions for user $user have been reset"
+
+exit $exit
\ No newline at end of file