From 77a4635f59a9b6e83484269e7915a71737656e8b Mon Sep 17 00:00:00 2001
From: Marco Ochse <t3chn0m4g3@gmail.com>
Date: Sun, 23 Jul 2017 10:25:40 +0000
Subject: [PATCH] maltrail is too far off scope

---
 installer/bin/clean.sh              | 10 ----------
 installer/etc/tpot/compose/all.yml  | 10 ----------
 installer/etc/tpot/compose/tpot.yml | 10 ----------
 installer/install.sh                |  1 -
 4 files changed, 31 deletions(-)

diff --git a/installer/bin/clean.sh b/installer/bin/clean.sh
index 453112b3..384bc8c4 100755
--- a/installer/bin/clean.sh
+++ b/installer/bin/clean.sh
@@ -138,14 +138,6 @@ fuMAILONEY () {
   chown tpot:tpot /data/mailoney/ -R
 }
 
-# Let's create a function to clean up and prepare maltrail data
-fuMALTRAIL () {
-  if [ "$myPERSISTENCE" != "on" ]; then rm -rf /data/maltrail/*; fi
-  mkdir -p /data/maltrail/log/
-  chmod 760 /data/maltrail/ -R
-  chown tpot:tpot /data/maltrail/ -R
-}
-
 # Let's create a function to prepare spiderfoot db
 fuSPIDERFOOT () {
   mkdir -p /data/spiderfoot
@@ -170,7 +162,6 @@ fuP0F () {
   chown tpot:tpot -R /data/p0f
 }
 
-
 # Avoid unwanted cleaning
 if [ "$myPERSISTENCE" = "" ];
   then
@@ -204,7 +195,6 @@ fuEMOBILITY
 fuGLASTOPF
 fuHONEYTRAP
 fuMAILONEY
-fuMALTRAIL
 fuSPIDERFOOT
 fuSURICATA
 fuP0F
diff --git a/installer/etc/tpot/compose/all.yml b/installer/etc/tpot/compose/all.yml
index d4d13c9f..55d683de 100644
--- a/installer/etc/tpot/compose/all.yml
+++ b/installer/etc/tpot/compose/all.yml
@@ -222,16 +222,6 @@ services:
     volumes:
      - /data/mailoney/log:/opt/mailoney/logs
 
-# Maltrail service
-#  maltrail:
-#    container_name: maltrail
-#    stdin_open: true
-#    restart: always
-#    network_mode: "host"
-#    image: "dtagdevsec/maltrail:1706"
-#    volumes:
-#     - /data/maltrail/log:/var/log/maltrail
- 
 # Netdata service
   netdata:
     container_name: netdata
diff --git a/installer/etc/tpot/compose/tpot.yml b/installer/etc/tpot/compose/tpot.yml
index 6789300b..2ca69c49 100644
--- a/installer/etc/tpot/compose/tpot.yml
+++ b/installer/etc/tpot/compose/tpot.yml
@@ -192,16 +192,6 @@ services:
     volumes:
      - /data/mailoney/log:/opt/mailoney/logs
 
-# Maltrail service
-#  maltrail:
-#    container_name: maltrail
-#    stdin_open: true
-#    restart: always
-#    network_mode: "host"
-#    image: "dtagdevsec/maltrail:1706"
-#    volumes:
-#     - /data/maltrail/log:/var/log/maltrail
-
 # Netdata service
   netdata:
     container_name: netdata
diff --git a/installer/install.sh b/installer/install.sh
index 4ca07a5c..dc5d8cf0 100755
--- a/installer/install.sh
+++ b/installer/install.sh
@@ -445,7 +445,6 @@ mkdir -p /data/conpot/log \
          /data/elk/data /data/elk/log \
          /data/glastopf /data/honeytrap/log/ /data/honeytrap/attacks/ /data/honeytrap/downloads/ \
          /data/mailoney/log \
-         /data/maltrail/log \
          /data/emobility/log \
          /data/ews/conf \
          /data/spiderfoot \