more error handling

This commit is contained in:
2025-06-25 09:56:27 -05:00
parent 3f0bf60b44
commit 09be6ebfb7

View File

@@ -88,10 +88,11 @@ echo Now running "$FUNCNAME"....
curl --silent ${DL_ROOT}/scripts/distro > /usr/local/bin/distro && chmod +x /usr/local/bin/distro curl --silent ${DL_ROOT}/scripts/distro > /usr/local/bin/distro && chmod +x /usr/local/bin/distro
curl --silent ${DL_ROOT}/scripts/up2date.sh > /usr/local/bin/up2date.sh && chmod +x /usr/local/bin/up2date.sh curl --silent ${DL_ROOT}/scripts/up2date.sh > /usr/local/bin/up2date.sh && chmod +x /usr/local/bin/up2date.sh
rm -rf /usr/local/librenms-agent 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 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 cd /usr/local && tar xfz librenms.tar.gz && rm -f /usr/local/librenms.tar.gz
cd - || exit
echo Completed running "$FUNCNAME" echo Completed running "$FUNCNAME"
@@ -126,7 +127,7 @@ if [ "$LOCALUSER_CHECK" = 1 ]; then
mkdir -p /home/localuser/.ssh/ mkdir -p /home/localuser/.ssh/
fi fi
ulimit curl --silent ${DL_ROOT}/ConfigFiles/SSH/AuthorizedKeys/localuser-ssh-authorized-keys > /home/localuser/.ssh/authorized_keys \ curl --silent ${DL_ROOT}/ConfigFiles/SSH/AuthorizedKeys/localuser-ssh-authorized-keys > /home/localuser/.ssh/authorized_keys \
&& chown localuser /home/localuser/.ssh/authorized_keys \ && chown localuser /home/localuser/.ssh/authorized_keys \
&& chmod 400 /home/localuser/.ssh/authorized_keys && chmod 400 /home/localuser/.ssh/authorized_keys
fi fi
@@ -179,7 +180,9 @@ curl -fsSL https://pkgs.tailscale.com/stable/debian/bookworm.tailscale-keyring.l
# add stuff we want # add stuff we want
export DEBIAN_FRONTEND="noninteractive" && apt-get -qq --yes -o Dpkg::Options::="--force-confold" install \ echo "Now installing all the packages..."
DEBIAN_FRONTEND="noninteractive" apt-get -qq --yes -o Dpkg::Options::="--force-confold" install \
virt-what \ virt-what \
htop \ htop \
dstat \ dstat \
@@ -231,19 +234,24 @@ iptables-persistent \
postfix \ postfix \
telnet telnet
echo "Main packages installed."
echo "Checking to see if we are on a kali system..."
export KALI_CHECK export KALI_CHECK
KALI_CHECK="$(distro |grep -c kali)" KALI_CHECK="$(distro |grep -c kali ||true)"
if [ "$KALI_CHECK" = 0 ]; then if [ "$KALI_CHECK" = 0 ]; then
export DEBIAN_FRONTEND="noninteractive" && apt-get -qq --yes -o Dpkg::Options::="--force-confold" install \
echo "We are not on a kali system, installing regular NTP packages..."
export DEBIAN_FRONTEND="noninteractive" apt-get -qq --yes -o Dpkg::Options::="--force-confold" install \
ntpdate \ ntpdate \
ntp ntp
fi fi
if [ "$KALI_CHECK" = 1 ]; then if [ "$KALI_CHECK" = 1 ]; then
export DEBIAN_FRONTEND="noninteractive" && apt-get -qq --yes -o Dpkg::Options::="--force-confold" install \ echo "We are on a kali system, installing Kali NTP packages..."
export DEBIAN_FRONTEND="noninteractive" apt-get -qq --yes -o Dpkg::Options::="--force-confold" install \
ntpsec-ntpdate \ ntpsec-ntpdate \
ntpsec ntpsec
fi fi
@@ -252,17 +260,17 @@ export VIRT_TYPE
VIRT_TYPE="$(virt-what)" VIRT_TYPE="$(virt-what)"
export VIRT_GUEST export VIRT_GUEST
VIRT_GUEST="$(echo "$VIRT_TYPE"|egrep 'hyperv|kvm' )" VIRT_GUEST="$(echo "$VIRT_TYPE"|egrep 'hyperv|kvm' ||true )"
export KVM_GUEST export KVM_GUEST
KVM_GUEST="$(echo "$VIRT_TYPE"|grep 'kvm')" KVM_GUEST="$(echo "$VIRT_TYPE"|grep 'kvm' || true)"
if [[ $KVM_GUEST = 1 ]]; then if [[ $KVM_GUEST = 1 ]]; then
apt -y install qemu-guest-agent apt -y install qemu-guest-agent
fi fi
export PHYSICAL_HOST export PHYSICAL_HOST
PHYSICAL_HOST="$(dmidecode -t System|grep -c Dell)" PHYSICAL_HOST="$(dmidecode -t System|grep -c Dell ||true)"
if [[ $PHYSICAL_HOST -gt 0 ]]; then if [[ $PHYSICAL_HOST -gt 0 ]]; then
export DEBIAN_FRONTEND="noninteractive" && apt-get -qq --yes -o Dpkg::Options::="--force-confold" install \ export DEBIAN_FRONTEND="noninteractive" && apt-get -qq --yes -o Dpkg::Options::="--force-confold" install \