From 5a2c087fae428e2d98c1e5701d8ca663cd6df58b Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 3 Dec 2023 22:16:04 -0600
Subject: [PATCH] Update install-dsmon.sh

---
 install-dsmon.sh | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/install-dsmon.sh b/install-dsmon.sh
index f0c799f..b47bcc7 100755
--- a/install-dsmon.sh
+++ b/install-dsmon.sh
@@ -100,23 +100,26 @@ if [ "${SET_ALERTEMAIL}" = "txt" ]; then
 	SET_ALERTEMAIL='9208839613@txt.att.net'
 elif [ "${SET_ALERTEMAIL}" = "mms" ]; then
 	SET_ALERTEMAIL='9208839613@mms.att.net'
+elif [ "${SET_ALERTEMAIL}" = "push" ]; then
+	SET_ALERTEMAIL='b3upzaom7a@pomail.net'
 fi
 
 echo -e -n "${idsCL[LightCyan]}Server Monitor ID (optional, or type 'new'): ${idsCL[Default]}"
 read SET_SERVERMONID
 echo ""
 
-
-echo -e "${idsCL[Yellow]}Sending test Alert... ${idsCL[Default]}"
-echo "Test Alert" | mail -r DSMon_$(hostname -s)@scity.us -s "Test" $SET_ALERTEMAIL
+if [ "${SET_ALERTEMAIL}" != "" ]; then
+	echo -e "${idsCL[Yellow]}Sending test Alert... ${idsCL[Default]}"
+	echo "Test Alert" | mail -r DSMon_$(hostname -s)@scity.us -s "Test" ${SET_ALERTEMAIL}
+fi
 
 echo -e "${idsCL[Yellow]}Adding task to crontab... ${idsCL[Default]}"
 crontab -l | grep -v 'dsmon hdd'  | crontab -
 crontab -l | grep -v 'dsmon sys'  | crontab -
 sleep 1s
-(crontab -l ; echo "$(($RANDOM % 59)) */1 * * * /usr/local/bin/dsmon hdd >/dev/null 2>&1")| crontab -
+(crontab -l ; echo "$(($RANDOM % 59)) */1 * * * /usr/local/bin/dsmon run hdd >/dev/null 2>&1")| crontab -
 sleep 1s
-(crontab -l ; echo "*/5+$(($RANDOM % 4)) * * * * /usr/local/bin/dsmon sys >/dev/null 2>&1")| crontab -
+(crontab -l ; echo "*/5+$(($RANDOM % 4)) * * * * /usr/local/bin/dsmon run sys >/dev/null 2>&1")| crontab -
 
 
 if [ "${SET_SERVERMONID}" = "new" ]; then
@@ -174,13 +177,18 @@ if [ "${SET_SERVERMONID}" = "new" ]; then
 fi
 
 echo -e "
-ALERT_EMAIL=${SET_ALERTEMAIL}
+
+#(optional)" >> /opt/idssys/dsmon/config.settings.inc
+[ "${SET_ALERTEMAIL}" != "" ] && echo -e "EMAIL_NOTICE=${SET_ALERTEMAIL}" >> /opt/idssys/dsmon/config.settings.inc || echo -e "# EMAIL_NOTICE=email@address.com" >> /opt/idssys/dsmon/config.settings.inc
+echo -e "# PUSHOVER_APP_TOKEN=\"atm1fd2fj8b5mopddior57dmrdq8ny\"
+# PUSHOVER_USER_TOKEN=\"\"
+
 SERVERMON_ID=${SET_SERVERMONID//id
 /}
 " >> /opt/idssys/dsmon/config.settings.inc
 
 echo -e "
-mail -r DSMon-\$(hostname -s)@scity.us -s 'Disk Space Alert' \$ALERT_EMAIL << EOF
+mail -r DSMon-\$(hostname -s)@scity.us -s 'Disk Space Alert' \${SET_ALERTEMAIL} << EOF
 Your root partition remaining free space is running low. Used: \$CURRENT%
 EOF
 
@@ -191,8 +199,8 @@ echo \"** Low Disk Space Alert Sent **\" >> /opt/idssys/dsmon/diskspace.log
 " > /opt/idssys/dsmon/config.actions.inc
 
 
-/usr/local/bin/dsmon hdd
-/usr/local/bin/dsmon sys
+/usr/local/bin/dsmon run hdd
+/usr/local/bin/dsmon run sys