From 7591b349e0b71718a80ef885380d6f73b84997a7 Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Tue, 11 Sep 2018 13:11:27 +0000
Subject: [PATCH] remove vnclowpot from 18.10 editions

---
 etc/compose/experimental.yml | 16 +--------------
 etc/compose/industrial.yml   | 40 +++++++++++++++++++++++-------------
 etc/compose/sensor.yml       | 16 +--------------
 etc/compose/standard.yml     | 16 +--------------
 4 files changed, 29 insertions(+), 59 deletions(-)

diff --git a/etc/compose/experimental.yml b/etc/compose/experimental.yml
index 769d4350..156a816b 100644
--- a/etc/compose/experimental.yml
+++ b/etc/compose/experimental.yml
@@ -15,7 +15,6 @@ networks:
   medpot_local:
   rdpy_local:
   tanner_local:
-  vnclowpot_local:
   ewsposter_local:
   spiderfoot_local:
 
@@ -215,7 +214,7 @@ services:
      - "993:993"
      - "995:995"
      - "5432:5432"
-    # - "5900:5900"
+     - "5900:5900"
     image: "dtagdevsec/heralding:1804"
     read_only: true
     volumes:
@@ -379,19 +378,6 @@ services:
     depends_on:
      - tanner
 
-# Vnclowpot service
-  vnclowpot:
-    container_name: vnclowpot
-    restart: always
-    networks:
-     - vnclowpot_local
-    ports:
-     - "5900:5900"
-    image: "dtagdevsec/vnclowpot:1804"
-    read_only: true
-    volumes:
-     - /data/vnclowpot/log:/var/log/vnclowpot
-
 
 ##################
 #### NSM
diff --git a/etc/compose/industrial.yml b/etc/compose/industrial.yml
index 66b77d6f..e7d51482 100644
--- a/etc/compose/industrial.yml
+++ b/etc/compose/industrial.yml
@@ -12,7 +12,6 @@ networks:
   cyberchef_local:
   medpot_local:
   rdpy_local:
-  vnclowpot_local:
   ewsposter_local:
   spiderfoot_local:
 
@@ -158,6 +157,32 @@ services:
      - /data/cowrie/log:/home/cowrie/cowrie/log
      - /data/cowrie/log/tty:/home/cowrie/cowrie/log/tty
 
+# Heralding service
+  heralding:
+    container_name: heralding
+    restart: always
+    tmpfs:
+     - /tmp/heralding:uid=2000,gid=2000
+    networks:
+     - heralding_local
+    ports:
+    # - "21:21"
+    # - "22:22"
+    # - "23:23"
+    # - "25:25"
+    # - "80:80"
+    # - "110:110"
+    # - "143:143"
+    # - "443:443"
+    # - "993:993"
+    # - "995:995"
+    # - "5432:5432"
+     - "5900:5900"
+    image: "dtagdevsec/heralding:1804"
+    read_only: true
+    volumes:
+     - /data/heralding/log:/var/log/heralding
+
 # Honeytrap service
   honeytrap:
     container_name: honeytrap
@@ -208,19 +233,6 @@ services:
     volumes:
      - /data/rdpy/log:/var/log/rdpy
 
-# Vnclowpot service
-  vnclowpot:
-    container_name: vnclowpot
-    restart: always
-    networks:
-     - vnclowpot_local
-    ports:
-     - "5900:5900"
-    image: "dtagdevsec/vnclowpot:1804"
-    read_only: true
-    volumes:
-     - /data/vnclowpot/log:/var/log/vnclowpot
-
 
 ##################
 #### NSM
diff --git a/etc/compose/sensor.yml b/etc/compose/sensor.yml
index 63a51ade..e723376f 100644
--- a/etc/compose/sensor.yml
+++ b/etc/compose/sensor.yml
@@ -14,7 +14,6 @@ networks:
   medpot_local:
   rdpy_local:
   tanner_local:
-  vnclowpot_local:
   ewsposter_local:
   spiderfoot_local:
 
@@ -214,7 +213,7 @@ services:
      - "993:993"
      - "995:995"
      - "5432:5432"
-    # - "5900:5900"
+     - "5900:5900"
     image: "dtagdevsec/heralding:1804"
     read_only: true
     volumes:
@@ -377,19 +376,6 @@ services:
     depends_on:
      - tanner
 
-# Vnclowpot service
-  vnclowpot:
-    container_name: vnclowpot
-    restart: always
-    networks:
-     - vnclowpot_local
-    ports:
-     - "5900:5900"
-    image: "dtagdevsec/vnclowpot:1804"
-    read_only: true
-    volumes:
-     - /data/vnclowpot/log:/var/log/vnclowpot
-
 
 ##################
 #### NSM
diff --git a/etc/compose/standard.yml b/etc/compose/standard.yml
index 81e6a6e7..36ee30fe 100644
--- a/etc/compose/standard.yml
+++ b/etc/compose/standard.yml
@@ -15,7 +15,6 @@ networks:
   medpot_local:
   rdpy_local:
   tanner_local:
-  vnclowpot_local:
   ewsposter_local:
   spiderfoot_local:
 
@@ -215,7 +214,7 @@ services:
      - "993:993"
      - "995:995"
      - "5432:5432"
-    # - "5900:5900"
+     - "5900:5900"
     image: "dtagdevsec/heralding:1804"
     read_only: true
     volumes:
@@ -378,19 +377,6 @@ services:
     depends_on:
      - tanner
 
-# Vnclowpot service
-  vnclowpot:
-    container_name: vnclowpot
-    restart: always
-    networks:
-     - vnclowpot_local
-    ports:
-     - "5900:5900"
-    image: "dtagdevsec/vnclowpot:1804"
-    read_only: true
-    volumes:
-     - /data/vnclowpot/log:/var/log/vnclowpot
-
 
 ##################
 #### NSM