Merge branch 'master' into dev

_deprecated/bin/rules.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ### Vars, Ports for Standard services
-myHOSTPORTS="7634 64294 64295"
+myHOSTPORTS="7634 64294 64295 64297 64304"
 myDOCKERCOMPOSEYML="$1"
 myRULESFUNCTION="$2"
 

_deprecated/etc/compose/collector.yml

@@ -237,9 +237,9 @@ services:
      - /run
      - /var/lib/nginx/tmp:uid=100,gid=82
     network_mode: "host"
-    ports:
+      #    ports:
-     - "64297:64297"
+      #     - "64297:64297"
-     - "127.0.0.1:64304:64304"
+      #     - "127.0.0.1:64304:64304"
     image: "dtagdevsec/nginx:2204"
     read_only: true
     volumes:

_deprecated/etc/compose/hive.yml

@@ -118,9 +118,9 @@ services:
      - /run
      - /var/lib/nginx/tmp:uid=100,gid=82
     network_mode: "host"
-    ports:
+      #    ports:
-     - "64297:64297"
+      #     - "64297:64297"
-     - "127.0.0.1:64304:64304"
+      #     - "127.0.0.1:64304:64304"
     image: "dtagdevsec/nginx:2204"
     read_only: true
     volumes:

_deprecated/etc/compose/industrial.yml

@@ -408,9 +408,9 @@ services:
      - /run
      - /var/lib/nginx/tmp:uid=100,gid=82
     network_mode: "host"
-    ports:
+      #    ports:
-     - "64297:64297"
+      #     - "64297:64297"
-     - "127.0.0.1:64304:64304"
+      #     - "127.0.0.1:64304:64304"
     image: "dtagdevsec/nginx:2204"
     read_only: true
     volumes:

_deprecated/etc/compose/log4j.yml

@@ -227,9 +227,9 @@ services:
      - /run
      - /var/lib/nginx/tmp:uid=100,gid=82
     network_mode: "host"
-    ports:
+      #    ports:
-     - "64297:64297"
+      #     - "64297:64297"
-     - "127.0.0.1:64304:64304"
+      #     - "127.0.0.1:64304:64304"
     image: "dtagdevsec/nginx:2204"
     read_only: true
     volumes:

_deprecated/etc/compose/medical.yml

@@ -221,9 +221,9 @@ services:
      - /run
      - /var/lib/nginx/tmp:uid=100,gid=82
     network_mode: "host"
-    ports:
+      #    ports:
-     - "64297:64297"
+      #     - "64297:64297"
-     - "127.0.0.1:64304:64304"
+      #     - "127.0.0.1:64304:64304"
     image: "dtagdevsec/nginx:2204"
     read_only: true
     volumes:

_deprecated/etc/compose/mini.yml

@@ -248,9 +248,9 @@ services:
      - /run
      - /var/lib/nginx/tmp:uid=100,gid=82
     network_mode: "host"
-    ports:
+      #    ports:
-     - "64297:64297"
+      #     - "64297:64297"
-     - "127.0.0.1:64304:64304"
+      #     - "127.0.0.1:64304:64304"
     image: "dtagdevsec/nginx:2204"
     read_only: true
     volumes:

_deprecated/etc/compose/nextgen.yml

@@ -552,9 +552,9 @@ services:
      - /run
      - /var/lib/nginx/tmp:uid=100,gid=82
     network_mode: "host"
-    ports:
+      #    ports:
-     - "64297:64297"
+      #     - "64297:64297"
-     - "127.0.0.1:64304:64304"
+      #     - "127.0.0.1:64304:64304"
     image: "dtagdevsec/nginx:2204"
     read_only: true
     volumes:

_deprecated/etc/compose/standard.yml

@@ -639,9 +639,9 @@ services:
      - /run
      - /var/lib/nginx/tmp:uid=100,gid=82
     network_mode: "host"
-    ports:
+      #    ports:
-     - "64297:64297"
+      #     - "64297:64297"
-     - "127.0.0.1:64304:64304"
+      #     - "127.0.0.1:64304:64304"
     image: "dtagdevsec/nginx:2204"
     read_only: true
     volumes:

_deprecated/etc/compose/tarpit.yml

@@ -264,9 +264,9 @@ services:
      - /run
      - /var/lib/nginx/tmp:uid=100,gid=82
     network_mode: "host"
-    ports:
+      #    ports:
-     - "64297:64297"
+      #     - "64297:64297"
-     - "127.0.0.1:64304:64304"
+      #     - "127.0.0.1:64304:64304"
     image: "dtagdevsec/nginx:2204"
     read_only: true
     volumes:

_deprecated/update.sh

@@ -3,7 +3,7 @@
 # Some global vars
 myCONFIGFILE="/opt/tpot/etc/tpot.yml"
 myCOMPOSEPATH="/opt/tpot/etc/compose"
-myLSB_RELEASE="bullseye"
+myLSB_RELEASE=("bullseye" "bookworm")
 myRED=""
 myGREEN=""
 myWHITE=""
@@ -91,7 +91,7 @@ local myMASTERVERSION="22.04.0"
 echo
 echo "### Checking for Release ID"
 myRELEASE=$(lsb_release -c | awk '{ print $2 }')
-if [ "$myRELEASE" != "$myLSB_RELEASE" ] 
+if [[ ! " ${myLSB_RELEASE[@]} " =~ " ${myRELEASE} " ]]; 
   then
     echo "###### Need to upgrade to Debian 11 (Bullseye) first:$myWHITE"" [ $myRED""NOT OK""$myWHITE ]"
     echo "###### Upgrade may result in complete data loss and should not be run via SSH."

docker/nginx/docker-compose.yml

@@ -20,9 +20,9 @@ services:
 #    cpu_count: 1
 #    cpus: 0.75
     network_mode: "host"
-    ports:
+      #    ports:
-     - "64297:64297"
+      #     - "64297:64297"
-     - "127.0.0.1:64304:64304"
+      #     - "127.0.0.1:64304:64304"
     image: "dtagdevsec/nginx:2204"
     read_only: true
     volumes: