From c0d0e016e6e28d27aa24a9d8deea8602fe098f9b Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Wed, 27 Mar 2019 13:39:23 +0000
Subject: [PATCH] tweaking

Update Heralding to support SOCKS5
Correct Readme
Resize tped.sh
---
 README.md                           | 2 +-
 bin/tped.sh                         | 2 +-
 docker/glastopf/docker-compose.yml  | 2 +-
 docker/heralding/dist/heralding.yml | 5 +++++
 docker/heralding/docker-compose.yml | 1 +
 etc/compose/collector.yml           | 1 +
 etc/compose/nextgen.yml             | 1 +
 etc/compose/sensor.yml              | 1 +
 etc/compose/standard.yml            | 1 +
 9 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index f25932a6..1576ecbd 100644
--- a/README.md
+++ b/README.md
@@ -413,7 +413,7 @@ You may opt out of the submission by removing the `# Ewsposter service` from `/o
     restart: always
     networks:
      - ewsposter_local
-    image: "dtagdevsec/ewsposter:1810"
+    image: "dtagdevsec/ewsposter:1903"
     volumes:
      - /data:/data
      - /data/ews/conf/ews.ip:/opt/ewsposter/ews.ip
diff --git a/bin/tped.sh b/bin/tped.sh
index 83ce2f2b..8c91fe0e 100755
--- a/bin/tped.sh
+++ b/bin/tped.sh
@@ -29,7 +29,7 @@ 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" 13 50 6 $myITEMS 3>&1 1>&2 2>&3 3>&-)
+myEDITION=$(dialog --backtitle "$myBACKTITLE" --menu "Select T-Pot Edition" 12 50 5 $myITEMS 3>&1 1>&2 2>&3 3>&-)
 if [ "$myEDITION" == "" ];
   then
     echo "Have a nice day!"
diff --git a/docker/glastopf/docker-compose.yml b/docker/glastopf/docker-compose.yml
index 65981921..5d67d6fc 100644
--- a/docker/glastopf/docker-compose.yml
+++ b/docker/glastopf/docker-compose.yml
@@ -15,7 +15,7 @@ services:
     networks:
      - glastopf_local
     ports:
-     - "80:80"
+     - "8081:80"
     image: "dtagdevsec/glastopf:1903"
     read_only: true
     volumes:
diff --git a/docker/heralding/dist/heralding.yml b/docker/heralding/dist/heralding.yml
index 8e03ef27..0dec4342 100644
--- a/docker/heralding/dist/heralding.yml
+++ b/docker/heralding/dist/heralding.yml
@@ -150,3 +150,8 @@ capabilities:
     enabled: true
     port: 5900
     timeout: 30
+
+  socks5:
+    enabled: true
+    port: 1080
+    timeout: 30
diff --git a/docker/heralding/docker-compose.yml b/docker/heralding/docker-compose.yml
index 6dd73382..392d5673 100644
--- a/docker/heralding/docker-compose.yml
+++ b/docker/heralding/docker-compose.yml
@@ -25,6 +25,7 @@ services:
      - "443:443"
      - "993:993"
      - "995:995"
+     - "1080:1080"
      - "5432:5432"
      - "5900:5900"
     image: "dtagdevsec/heralding:1903"
diff --git a/etc/compose/collector.yml b/etc/compose/collector.yml
index 6d90024e..5af318a8 100644
--- a/etc/compose/collector.yml
+++ b/etc/compose/collector.yml
@@ -33,6 +33,7 @@ services:
      - "443:443"
      - "993:993"
      - "995:995"
+     - "1080:1080"
      - "5432:5432"
      - "5900:5900"
     image: "dtagdevsec/heralding:1903"
diff --git a/etc/compose/nextgen.yml b/etc/compose/nextgen.yml
index 57dccaf6..0a74dcdd 100644
--- a/etc/compose/nextgen.yml
+++ b/etc/compose/nextgen.yml
@@ -232,6 +232,7 @@ services:
     # - "443:443"
      - "993:993"
      - "995:995"
+     - "1080:1080"
      - "5432:5432"
      - "5900:5900"
     image: "dtagdevsec/heralding:1903"
diff --git a/etc/compose/sensor.yml b/etc/compose/sensor.yml
index 4e434810..068d378a 100644
--- a/etc/compose/sensor.yml
+++ b/etc/compose/sensor.yml
@@ -227,6 +227,7 @@ services:
     # - "443:443"
      - "993:993"
      - "995:995"
+     - "1080:1080"
      - "5432:5432"
      - "5900:5900"
     image: "dtagdevsec/heralding:1903"
diff --git a/etc/compose/standard.yml b/etc/compose/standard.yml
index bf4634c3..2dce4789 100644
--- a/etc/compose/standard.yml
+++ b/etc/compose/standard.yml
@@ -228,6 +228,7 @@ services:
     # - "443:443"
      - "993:993"
      - "995:995"
+     - "1080:1080"
      - "5432:5432"
      - "5900:5900"
     image: "dtagdevsec/heralding:1903"