From 3b705a23bad5f4f2fd62a4ce87af304e62c628c5 Mon Sep 17 00:00:00 2001
From: ReachableCEO <charles@turnsys.com>
Date: Wed, 9 Jul 2025 11:24:20 -0500
Subject: [PATCH] don't install rsyslog on librenms server fixed some
 formatting

---
 ProjectCode/SetupNewSystem.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/ProjectCode/SetupNewSystem.sh b/ProjectCode/SetupNewSystem.sh
index 1600ff0..3a683ec 100644
--- a/ProjectCode/SetupNewSystem.sh
+++ b/ProjectCode/SetupNewSystem.sh
@@ -124,12 +124,13 @@ function global-installPackages() {
     dstat \
     snmpd \
     ncdu \
-    latencytop \
     iftop \
-    acct \
+    iotop \
+    latencytop \
     nethogs \
     sysstat \
     ngrep \
+    acct \
     lsb-release \
     screen \
     tailscale \
@@ -148,7 +149,6 @@ function global-installPackages() {
     mailutils \
     clamav \
     sl \
-    rsyslog \
     logwatch \
     git \
     net-tools \
@@ -162,7 +162,6 @@ function global-installPackages() {
     fonts-powerline \
     webmin \
     usermin \
-    iotop \
     ntpsec \
     ntpsec-ntpdate \
     tuned \
@@ -262,18 +261,22 @@ function global-postPackageConfiguration() {
   cat ./ConfigFiles/NetworkDiscovery/lldpd >/etc/default/lldpd
   systemctl restart lldpd
 
-  systemctl stop rsyslog
-  systemctl start rsyslog
+  export LIBRENMS_CHECK
+  LIBRENMS_CHECK="$(hostname | grep -c tsys-librenms || true)"
+
+  if [ "$LIBRENMS_CHECK" -eq 0 ]; then
+    DEBIAN_FRONTEND="noninteractive" apt-get -qq --yes -o Dpkg::Options::="--force-confold" install rsyslog
+    systemctl stop rsyslog
+    systemctl start rsyslog
+  fi
 
   export NTP_SERVER_CHECK
   NTP_SERVER_CHECK="$(hostname | egrep -c 'pfv-netboot|pfvsvrpi' || true)"
 
   if [ "$NTP_SERVER_CHECK" -eq 0 ]; then
 
-    print_info "Not updating NTP config, this is the TSYS Stratum1 NTP server..."
     cat ./ConfigFiles/NTP/ntp.conf >/etc/ntpsec/ntp.conf
     systemctl restart ntpsec.service
-
   fi
 
   systemctl stop postfix