From 5549409dcc9014676ff1c277ff7b0fd0e78372aa Mon Sep 17 00:00:00 2001
From: Charles N Wyble <reachableceo@turnsys.com>
Date: Thu, 26 Jun 2025 14:10:53 -0500
Subject: [PATCH] OAM / security hardending is my entire next week. laying the
 groundwork.

---
 Agents/librenms.tar.gz                        | Bin 10012 -> 0 bytes
 {librenms => Agents/librenms}/ntp-client.sh   |   0
 {librenms => Agents/librenms}/ntp-server.sh   |   0
 {librenms => Agents/librenms}/os-updates.sh   |   0
 .../librenms/postfix-queues,sh                |   0
 .../librenms/postfixdetailed.sh               |   0
 {librenms => Agents/librenms}/smart           |   0
 {librenms => Agents/librenms}/smart.config    |   0
 ConfigFiles/SNMP/snmpd-physicalhost.conf      |   3 +
 Modules/Security/secharden-wazuh copy.sh      |  19 +++
 Modules/Security/secharden-wazuh.sh           |  13 +-
 SetupNewSystem.sh                             |  14 ++-
 librenms/distro                               | 114 ------------------
 librenms/snmpd.conf                           |  32 -----
 14 files changed, 37 insertions(+), 158 deletions(-)
 delete mode 100644 Agents/librenms.tar.gz
 rename {librenms => Agents/librenms}/ntp-client.sh (100%)
 rename {librenms => Agents/librenms}/ntp-server.sh (100%)
 rename {librenms => Agents/librenms}/os-updates.sh (100%)
 rename librenms/postfix-queues => Agents/librenms/postfix-queues,sh (100%)
 rename librenms/postfixdetailed => Agents/librenms/postfixdetailed.sh (100%)
 rename {librenms => Agents/librenms}/smart (100%)
 rename {librenms => Agents/librenms}/smart.config (100%)
 create mode 100644 Modules/Security/secharden-wazuh copy.sh
 delete mode 100644 librenms/distro
 delete mode 100644 librenms/snmpd.conf

diff --git a/Agents/librenms.tar.gz b/Agents/librenms.tar.gz
deleted file mode 100644
index b4f123c93b3c147e11e557de79b1c0f03766f3dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10012
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

diff --git a/librenms/ntp-client.sh b/Agents/librenms/ntp-client.sh
similarity index 100%
rename from librenms/ntp-client.sh
rename to Agents/librenms/ntp-client.sh
diff --git a/librenms/ntp-server.sh b/Agents/librenms/ntp-server.sh
similarity index 100%
rename from librenms/ntp-server.sh
rename to Agents/librenms/ntp-server.sh
diff --git a/librenms/os-updates.sh b/Agents/librenms/os-updates.sh
similarity index 100%
rename from librenms/os-updates.sh
rename to Agents/librenms/os-updates.sh
diff --git a/librenms/postfix-queues b/Agents/librenms/postfix-queues,sh
similarity index 100%
rename from librenms/postfix-queues
rename to Agents/librenms/postfix-queues,sh
diff --git a/librenms/postfixdetailed b/Agents/librenms/postfixdetailed.sh
similarity index 100%
rename from librenms/postfixdetailed
rename to Agents/librenms/postfixdetailed.sh
diff --git a/librenms/smart b/Agents/librenms/smart
similarity index 100%
rename from librenms/smart
rename to Agents/librenms/smart
diff --git a/librenms/smart.config b/Agents/librenms/smart.config
similarity index 100%
rename from librenms/smart.config
rename to Agents/librenms/smart.config
diff --git a/ConfigFiles/SNMP/snmpd-physicalhost.conf b/ConfigFiles/SNMP/snmpd-physicalhost.conf
index bed372e..1495fdb 100644
--- a/ConfigFiles/SNMP/snmpd-physicalhost.conf
+++ b/ConfigFiles/SNMP/snmpd-physicalhost.conf
@@ -37,6 +37,9 @@ extend serial /usr/bin/sudo /usr/bin/cat /sys/devices/virtual/dmi/id/product_ser
 #SMART
 extend smart /bin/cat /var/cache/smart
 
+#Temperature
+pass_persist    .1.3.6.1.4.1.9.9.13.1.3 /usr/local/bin/temper-snmp
+
 
 # Allow Systems Management Data Engine SNMP to connect to snmpd using SMUX
 # smuxpeer .1.3.6.1.4.1.674.10892.1
diff --git a/Modules/Security/secharden-wazuh copy.sh b/Modules/Security/secharden-wazuh copy.sh
new file mode 100644
index 0000000..4bac839
--- /dev/null
+++ b/Modules/Security/secharden-wazuh copy.sh	
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# We don't want to run this on the wazuh server, otherwise bad things happen...
+
+export TSYS_NSM_CHECK
+TSYS_NSM_CHECK="$(hostname |grep -c tsys-nsm ||true)"
+
+if [ "$TSYS_NSM_CHECK" -eq 0 ]; then
+
+curl -s https://packages.wazuh.com/key/GPG-KEY-WAZUH | gpg --no-default-keyring --keyring gnupg-ring:/usr/share/keyrings/wazuh.gpg --import && chmod 644 /usr/share/keyrings/wazuh.gpg
+echo "deb [signed-by=/usr/share/keyrings/wazuh.gpg] https://packages.wazuh.com/4.x/apt/ stable main" > /etc/apt/sources.list.d/wazuh.list
+apt-get update
+WAZUH_MANAGER="tsys-nsm.knel.net" apt-get -y install wazuh-agent
+systemctl daemon-reload
+systemctl enable wazuh-agent
+systemctl start wazuh-agent
+echo "wazuh-agent hold" | dpkg --set-selections
+
+fi
\ No newline at end of file
diff --git a/Modules/Security/secharden-wazuh.sh b/Modules/Security/secharden-wazuh.sh
index 4bac839..631d557 100644
--- a/Modules/Security/secharden-wazuh.sh
+++ b/Modules/Security/secharden-wazuh.sh
@@ -6,14 +6,9 @@ export TSYS_NSM_CHECK
 TSYS_NSM_CHECK="$(hostname |grep -c tsys-nsm ||true)"
 
 if [ "$TSYS_NSM_CHECK" -eq 0 ]; then
+echo "stub... installing agent..."
+fi
 
-curl -s https://packages.wazuh.com/key/GPG-KEY-WAZUH | gpg --no-default-keyring --keyring gnupg-ring:/usr/share/keyrings/wazuh.gpg --import && chmod 644 /usr/share/keyrings/wazuh.gpg
-echo "deb [signed-by=/usr/share/keyrings/wazuh.gpg] https://packages.wazuh.com/4.x/apt/ stable main" > /etc/apt/sources.list.d/wazuh.list
-apt-get update
-WAZUH_MANAGER="tsys-nsm.knel.net" apt-get -y install wazuh-agent
-systemctl daemon-reload
-systemctl enable wazuh-agent
-systemctl start wazuh-agent
-echo "wazuh-agent hold" | dpkg --set-selections
-
+if [ "$TSYS_NSM_CHECK" -ne 0 ]; then
+echo "stub... NOT installing agent... NO BAD THINGS..."
 fi
\ No newline at end of file
diff --git a/SetupNewSystem.sh b/SetupNewSystem.sh
index b08911c..355f140 100644
--- a/SetupNewSystem.sh
+++ b/SetupNewSystem.sh
@@ -90,9 +90,17 @@ curl --silent ${DL_ROOT}/scripts/up2date.sh > /usr/local/bin/up2date.sh && chmod
 
 echo "Setting up librenms agent..."
 
-rm -rf /usr/local/librenms-agent || true
-curl --silent ${DL_ROOT}/Agents/librenms.tar.gz > /usr/local/librenms.tar.gz
-cd /usr/local && tar xfz librenms.tar.gz && rm -f /usr/local/librenms.tar.gz
+if [ ! -d /usr/local/librenms-agent ]; then
+mkdir -p /usr/local/librenms-agent
+fi
+
+curl --silent ${DL_ROOT}/Agents/librenms/ntp-client.sh > /usr/local/librenms-agent/ntp-client.sh
+curl --silent ${DL_ROOT}/Agents/librenms/ntp-server.sh > /usr/local/librenms-agent/ntp-server.sh
+curl --silent ${DL_ROOT}/Agents/librenms/os-updates.sh > /usr/local/librenms-agent/os-updates.sh
+curl --silent ${DL_ROOT}/Agents/librenms/postfixdetailed.sh > /usr/local/librenms-agent/postfixdetailed.sh
+curl --silent ${DL_ROOT}/Agents/librenms/postfix-queues.sh > /usr/local/librenms-agent/postfixdetailed.sh
+curl --silent ${DL_ROOT}/Agents/librenms/smart > /usr/local/librenms-agent/smart
+curl --silent ${DL_ROOT}/Agents/librenms/smart.config > /usr/local/librenms-agent/smart.config
 
 echo Completed running "$FUNCNAME"
 
diff --git a/librenms/distro b/librenms/distro
deleted file mode 100644
index 61ad248..0000000
--- a/librenms/distro
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/usr/bin/env bash
-# Detects which OS and if it is Linux then it will detect which Linux Distribution.
-
-OS=`uname -s`
-REV=`uname -r`
-MACH=`uname -m`
-
-if [ "${OS}" = "SunOS" ] ; then
-  OS=Solaris
-  ARCH=`uname -p`
-  OSSTR="${OS} ${REV}(${ARCH} `uname -v`)"
-
-elif [ "${OS}" = "AIX" ] ; then
-  OSSTR="${OS} `oslevel` (`oslevel -r`)"
-
-elif [ "${OS}" = "Linux" ] ; then
-  KERNEL=`uname -r`
-
-  if [ -f /etc/fedora-release ]; then
-    DIST=$(cat /etc/fedora-release | awk '{print $1}')
-    REV=`cat /etc/fedora-release | sed s/.*release\ // | sed s/\ .*//`
-        
-  elif [ -f /etc/redhat-release ] ; then
-    DIST=$(cat /etc/redhat-release | awk '{print $1}')
-    if [ "${DIST}" = "CentOS" ]; then
-      DIST="CentOS"
-    elif [ "${DIST}" = "Mandriva" ]; then
-      DIST="Mandriva"
-      PSEUDONAME=`cat /etc/mandriva-release | sed s/.*\(// | sed s/\)//`
-      REV=`cat /etc/mandriva-release | sed s/.*release\ // | sed s/\ .*//`
-    elif [ -f /etc/oracle-release ]; then
-      DIST="Oracle"
-    else
-      DIST="RedHat"
-    fi
-
-    PSEUDONAME=`cat /etc/redhat-release | sed s/.*\(// | sed s/\)//`
-    REV=`cat /etc/redhat-release | sed s/.*release\ // | sed s/\ .*//`
-
-  elif [ -f /etc/mandrake-release ] ; then
-    DIST='Mandrake'
-    PSEUDONAME=`cat /etc/mandrake-release | sed s/.*\(// | sed s/\)//`
-    REV=`cat /etc/mandrake-release | sed s/.*release\ // | sed s/\ .*//`
-
-  elif [ -f /etc/devuan_version ] ; then
-    DIST="Devuan `cat /etc/devuan_version`"
-    REV=""
-
-  elif [ -f /etc/debian_version ] ; then
-    DIST="Debian `cat /etc/debian_version`"
-    REV=""
-    ID=`lsb_release -i | awk -F ':' '{print $2}' | sed 's/	//g'`
-    if [ "${ID}" = "Raspbian" ] ; then
-      DIST="Raspbian `cat /etc/debian_version`"
-    fi
-
-  elif [ -f /etc/gentoo-release ] ; then
-    DIST="Gentoo"
-    REV=$(tr -d '[[:alpha:]]' </etc/gentoo-release | tr -d " ")
-
-  elif [ -f /etc/arch-release ] ; then
-    DIST="Arch Linux"
-    REV="" # Omit version since Arch Linux uses rolling releases
-    IGNORE_LSB=1 # /etc/lsb-release would overwrite $REV with "rolling"
-
-  elif [ -f /etc/os-release ] ; then
-    DIST=$(grep '^NAME=' /etc/os-release | cut -d= -f2- | tr -d '"')
-    REV=$(grep '^VERSION_ID=' /etc/os-release | cut -d= -f2- | tr -d '"')
-
-  elif [ -f /etc/openwrt_version ] ; then
-    DIST="OpenWrt"
-    REV=$(cat /etc/openwrt_version)
-
-  elif [ -f /etc/pld-release ] ; then
-    DIST=$(cat /etc/pld-release)
-    REV=""
-
-  elif [ -f /etc/SuSE-release ] ; then
-    DIST=$(echo SLES $(grep VERSION /etc/SuSE-release | cut -d = -f 2 | tr -d " "))
-    REV=$(echo SP$(grep PATCHLEVEL /etc/SuSE-release | cut -d = -f 2 | tr -d " "))
-  fi
-
-  if [ -f /etc/lsb-release -a "${IGNORE_LSB}" != 1 ] ; then
-    LSB_DIST=$(lsb_release -si)
-    LSB_REV=$(lsb_release -sr)
-    if [ "$LSB_DIST" != "" ] ; then
-      DIST=$LSB_DIST
-    fi
-    if [ "$LSB_REV" != "" ] ; then
-      REV=$LSB_REV
-    fi
-  fi
-
-  if [ "`uname -a | awk '{print $(NF)}'`" = "DD-WRT" ] ; then
-    DIST="dd-wrt"
-  fi
-
-  if [ -n "${REV}" ]
-  then
-    OSSTR="${DIST} ${REV}"
-  else
-    OSSTR="${DIST}"
-  fi
-
-elif [ "${OS}" = "Darwin" ] ; then
-  if [ -f /usr/bin/sw_vers ] ; then
-    OSSTR=`/usr/bin/sw_vers|grep -v Build|sed 's/^.*:.//'| tr "\n" ' '`
-  fi
-
-elif [ "${OS}" = "FreeBSD" ] ; then
-  OSSTR=`/usr/bin/uname -mior`
-fi
-
-echo ${OSSTR}
diff --git a/librenms/snmpd.conf b/librenms/snmpd.conf
deleted file mode 100644
index ee89764..0000000
--- a/librenms/snmpd.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-##########################################################################
-# snmpd.conf
-# Created by CNW on 11/3/2018 via snmpconf wizard and manual post tweaks
-###########################################################################
-# SECTION: Monitor Various Aspects of the Running Host
-#
-#   The following check up on various aspects of a host.
-
-# disk: Check for disk space usage of a partition.
-#   The agent can check the amount of available disk space, and make
-#   sure it is above a set limit.  
-#   
-load  3 3 3
-rocommunity  kn3lmgmt 10.253.3.99
-syslocation PFV
-syscontact  prodtechopsalerts@turnsys.com
-sysservices 76
-
-
-#TSYS tweaks
-#Temperature
-#pass_persist    .1.3.6.1.4.1.9.9.13.1.3 /usr/local/bin/temper-snmp
-#Smart
-extend smart /usr/local/librenms/smart
-#NTP
-extend ntp-client /usr/local/librenms/ntp-client.sh
-#SMTP
-extend mailq /usr/local/librenms/postfix-queues
-#Distro Detection
-extend .1.3.6.1.4.1.2021.7890.1 distro /usr/local/librenms/distro
-#extend zfs /usr/local/bin/zfs
-extend osupdate /usr/local/librenms/os-updates.sh