cleanup, tweaking, updating

make tpotinit aware of sigterm events to unload blackhole routes, firewall rules
fixes #1204 where citrixhoneypot logs use logs instead of log folder
bump ELK stack to 8.12.2
add wordpot logs to logstash pipeline
bump t-pot attackmap to 2.2.0, alpine 3.19

docker/tpotinit/dist/bin/clean.sh

@@ -106,7 +106,7 @@ fuCISCOASA () {
 # Let's create a function to clean up and prepare citrixhoneypot data
 fuCITRIXHONEYPOT () {
   if [ "$myPERSISTENCE" != "on" ]; then rm -rf /data/citrixhoneypot/*; fi
-  mkdir -vp /data/citrixhoneypot/logs/
+  mkdir -vp /data/citrixhoneypot/log/
   chmod 770 /data/citrixhoneypot/ -R
   chown tpot:tpot /data/citrixhoneypot/ -R
 }

docker/tpotinit/dist/bin/tpdclean.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-# T-Pot Compose and Container Cleaner
-# Set colors
-myRED=""
-myGREEN=""
-myWHITE=""
-
-# Only run with command switch
-if [ "$1" != "-y" ]; then
-  echo $myRED"### WARNING"$myWHITE
-  echo ""
-  echo $myRED"###### This script is only intended for the tpot.service."$myWHITE
-  echo $myRED"###### Run <systemctl stop tpot> first and then <tpdclean.sh -y>."$myWHITE
-  echo $myRED"###### Be aware, all T-Pot container volumes and images will be removed."$myWHITE
-  echo ""
-  echo $myRED"### WARNING "$myWHITE
-  echo
-  exit
-fi
-
-# Remove old containers, images and volumes
-docker-compose -f /opt/tpot/etc/tpot.yml down -v >> /dev/null 2>&1
-docker-compose -f /opt/tpot/etc/tpot.yml rm -v >> /dev/null 2>&1
-docker network rm $(docker network ls -q) >> /dev/null 2>&1
-docker volume rm $(docker volume ls -q) >> /dev/null 2>&1
-docker rm -v $(docker ps -aq) >> /dev/null 2>&1
-docker rmi $(docker images | grep "<none>" | awk '{print $3}') >> /dev/null 2>&1
-docker rmi $(docker images | grep "2203" | awk '{print $3}') >> /dev/null 2>&1
-exit 0

docker/tpotinit/dist/bin/tped.sh

@@ -1,56 +0,0 @@
-#!/bin/bash
-
-# Run as root only.
-myWHOAMI=$(whoami)
-if [ "$myWHOAMI" != "root" ]
-  then
-    echo "Need to run as root ..."
-    exit
-fi
-
-# set backtitle, get filename
-myBACKTITLE="T-Pot Edition Selection Tool"
-myYMLS=$(cd /opt/tpot/etc/compose/ && ls -1 *.yml)
-myLINK="/opt/tpot/etc/tpot.yml"
-
-# Let's load docker images in parallel
-function fuPULLIMAGES {
-local myTPOTCOMPOSE="/opt/tpot/etc/tpot.yml"
-for name in $(cat $myTPOTCOMPOSE | grep -v '#' | grep image | cut -d'"' -f2 | uniq)
-  do
-    docker pull $name &
-  done
-wait
-echo
-}
-
-# setup menu
-for i in $myYMLS;
-  do
-    myITEMS+="$i $(echo $i | cut -d "." -f1 | tr [:lower:] [:upper:]) " 
-done
-myEDITION=$(dialog --backtitle "$myBACKTITLE" --menu "Select T-Pot Edition" 18 50 1 $myITEMS 3>&1 1>&2 2>&3 3>&-)
-if [ "$myEDITION" == "" ];
-  then
-    echo "Have a nice day!"
-    exit
-fi
-dialog --backtitle "$myBACKTITLE" --title "[ Activate now? ]" --yesno "\n$myEDITION" 7 50
-myOK=$?
-if [ "$myOK" == "0" ];
-  then
-    echo "OK - Activating and downloading latest images."
-    systemctl stop tpot
-    if [ "$(docker ps -aq)" != "" ];
-      then
-        docker stop $(docker ps -aq)
-        docker rm $(docker ps -aq)
-    fi
-    rm -f $myLINK
-    ln -s /opt/tpot/etc/compose/$myEDITION $myLINK
-    fuPULLIMAGES
-    systemctl start tpot
-    echo "Done. Use \"dps.sh\" for monitoring"
-  else 
-    echo "Have a nice day!"
-fi