From 6fb2fa783a68f3ff37cb0efa208ee7ca8a7d53f1 Mon Sep 17 00:00:00 2001
From: Marco Ochse <t3chn0m4g3@users.noreply.github.com>
Date: Thu, 18 Nov 2021 21:32:48 +0100
Subject: [PATCH] update for new honeypots

---
 bin/clean.sh                 |  9 +++++++++
 etc/logrotate/logrotate.conf |  1 +
 iso/installer/install.sh     | 13 +++++++------
 update.sh                    |  1 +
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/bin/clean.sh b/bin/clean.sh
index 85f79245..f3538a4e 100755
--- a/bin/clean.sh
+++ b/bin/clean.sh
@@ -197,6 +197,14 @@ fuHERALDING () {
   chown tpot:tpot /data/heralding -R
 }
 
+# Let's create a function to clean up and prepare honeypots data
+fuHONEYPOTS () {
+  if [ "$myPERSISTENCE" != "on" ]; then rm -rf /data/honeypots/*; fi
+  mkdir -p /data/honeypots/log
+  chmod 770 /data/honeypots -R
+  chown tpot:tpot /data/honeypots -R
+}
+
 # Let's create a function to clean up and prepare honeypy data
 fuHONEYPY () {
   if [ "$myPERSISTENCE" != "on" ]; then rm -rf /data/honeypy/*; fi
@@ -339,6 +347,7 @@ if [ "$myPERSISTENCE" = "on" ];
     fuHERALDING
     fuHELLPOT
     fuHONEYSAP
+    fuHONEYPOTS
     fuHONEYPY
     fuHONEYTRAP
     fuIPPHONEY
diff --git a/etc/logrotate/logrotate.conf b/etc/logrotate/logrotate.conf
index 773bd997..5f2405b1 100644
--- a/etc/logrotate/logrotate.conf
+++ b/etc/logrotate/logrotate.conf
@@ -23,6 +23,7 @@
 /data/heralding/log/*.log
 /data/heralding/log/*.csv
 /data/heralding/log/*.json
+/data/honeypots/log/*.log
 /data/honeypy/log/*.log
 /data/honeysap/log/*.log
 /data/honeytrap/log/*.log
diff --git a/iso/installer/install.sh b/iso/installer/install.sh
index 32557aa0..34af3325 100755
--- a/iso/installer/install.sh
+++ b/iso/installer/install.sh
@@ -802,27 +802,28 @@ mkdir -vp /data/adbhoney/{downloads,log} \
          /data/conpot/log \
          /data/citrixhoneypot/logs \
          /data/cowrie/{downloads,keys,misc,log,log/tty} \
-	 /data/ddospot/{bl,db,log} \
-	 /data/dicompot/{images,log} \
+	       /data/ddospot/{bl,db,log} \
+	       /data/dicompot/{images,log} \
          /data/dionaea/{log,bistreams,binaries,rtp,roots,roots/ftp,roots/tftp,roots/www,roots/upnp} \
          /data/elasticpot/log \
          /data/elk/{data,log} \
-	 /data/endlessh/log \
+	       /data/endlessh/log \
          /data/fatt/log \
          /data/honeytrap/{log,attacks,downloads} \
          /data/glutton/log \
-	 /data/hellpot/log \
+	       /data/hellpot/log \
          /data/heralding/log \
+         /data/honeypots/log \
          /data/honeypy/log \
          /data/honeysap/log \
-	 /data/ipphoney/log \
+	       /data/ipphoney/log \
          /data/mailoney/log \
          /data/medpot/log \
          /data/nginx/{log,heimdall} \
          /data/emobility/log \
          /data/ews/conf \
          /data/rdpy/log \
-	 /data/redishoneypot/log \
+	       /data/redishoneypot/log \
          /data/spiderfoot \
          /data/suricata/log \
          /data/tanner/{log,files} \
diff --git a/update.sh b/update.sh
index e5df7992..8b1aa432 100755
--- a/update.sh
+++ b/update.sh
@@ -239,6 +239,7 @@ mkdir -vp /data/adbhoney/{downloads,log} \
          /data/glutton/log \
          /data/hellpot/log \
          /data/heralding/log \
+         /data/honeypots/log \
          /data/honeypy/log \
          /data/honeysap/log \
          /data/ipphoney/log \