From c60fca2a935ce9c44c2259a2a6c5b876e748b903 Mon Sep 17 00:00:00 2001
From: Thomas de Roo <thomas@noreply.localhost>
Date: Fri, 1 Sep 2023 13:35:22 +0200
Subject: [PATCH] Update DebianTweaks.sh

---
 DebianTweaks.sh | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/DebianTweaks.sh b/DebianTweaks.sh
index 2e3e0cf..deb2bab 100755
--- a/DebianTweaks.sh
+++ b/DebianTweaks.sh
@@ -1,27 +1,32 @@
 #!/bin/bash
 
-
-#Set the correct mailer fqdn
+echo "--------------------"
+echo Set the correct mailer fqdn
 echo $(hostname -f) > /etc/mailname
 
-# Forward mail to root
+echo "--------------------"
+echo Forward mail to root
 echo root: thomas@de-roo.org >> /etc/aliases
 /usr/bin/newaliases
 
-#Add mailto address in crontab
+echo "--------------------"
+echo Add mailto address in crontab
 awk '/PATH=\/usr\/local\/sbin:\/usr\/local\/bin:\/sbin:\/bin:\/usr\/sbin:\/usr\/bin/ { print; print "MAILTO=thomas@de-roo.org"; next }1' /etc/crontab > /tmp/crontab.temp
 cat /tmp/crontab.temp > /etc/crontab
 rm /tmp/crontab.temp
 
-#Better logon-message
+echo "--------------------"
+echo Better logon-message
 figlet $(hostname)>/etc/motd
 
-#Apt Updates
+echo "--------------------"
+echo Apt Updates
 curl https://git.de-roo.org/DEROO/apt-update/raw/branch/main/apt-update.sh -o /usr/local/bin/apt-update.sh
 chmod a+x /usr/local/bin/apt-update.sh
 echo 0 0 * * * root /usr/local/bin/apt-update.sh >> /etc/crontab
 
-#SNMP things. N.B.: replace VULHIERDELOCATIEIN later
+echo "--------------------"
+echo SNMP things. N.B.: replace VULHIERDELOCATIEIN later
 cat > /etc/snmp/snmpd.conf << 'EOF'
 sysLocation  VULHIERDELOCATIEIN
 sysContact   Thomas de Roo <thomas@de-roo.org>
@@ -49,7 +54,8 @@ echo @reboot root chmod 444 /sys/devices/virtual/dmi/id/product_serial >> /etc/c
 chmod 444 /sys/devices/virtual/dmi/id/product_serial
 systemctl restart snmpd
 
-# Debian Trixie apt sources
+echo "--------------------"
+echo  Debian Trixie apt sources
 cat > /etc/apt/sources.list << "EOF"
 deb http://deb.debian.org/debian trixie main contrib non-free non-free-firmware
 deb-src http://deb.debian.org/debian trixie main contrib non-free non-free-firmware
@@ -71,14 +77,16 @@ deb [arch=amd64] http://packages.microsoft.com/repos/code stable main
 EOF
 
 apt install gnupg -y
-# Chrome
+echo  Chrome
 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
-# Microsoft
+echo  Microsoft
 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EB3E94ADBE1229CF
-# Multimedia
+echo  Multimedia
 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5C808C2B65558117
 ln -s /etc/apt/trusted.gpg /etc/apt/trusted.gpg.d/
-# osquery
+
+echo "--------------------"
+echo  osquery
 mkdir -p /etc/apt/keyrings
 curl -L https://pkg.osquery.io/deb/pubkey.gpg | sudo tee /etc/apt/keyrings/osquery.asc
 cat >> /etc/apt/sources.list.d/osquery.list << "EOF"
@@ -124,7 +132,8 @@ EOF
 systemctl enable osqueryd
 systemctl start osqueryd
 
-# Wazuh agent
+echo "--------------------"
+echo Wazuh agent
 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" | tee -a /etc/apt/sources.list.d/wazuh.list
 apt update