From c4903fef663ef36d77e8a32bff27de20d2400de0 Mon Sep 17 00:00:00 2001
From: Marco Ochse <t3chn0m4g3@users.noreply.github.com>
Date: Mon, 14 Dec 2015 18:08:59 +0100
Subject: [PATCH] dionaea will log to host /data/dionaea

---
 installer/upstart/dionaea.conf | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/installer/upstart/dionaea.conf b/installer/upstart/dionaea.conf
index 75194080..f63cfc97 100644
--- a/installer/upstart/dionaea.conf
+++ b/installer/upstart/dionaea.conf
@@ -2,7 +2,7 @@
 # T-Pot                                                #
 # Dionaea upstart script                               #
 #                                                      #
-# v16.03.1 by mo, DTAG, 2015-12-11                     #
+# v16.03.2 by mo, DTAG, 2015-12-14                     #
 ########################################################
 
 description "Dionaea"
@@ -16,12 +16,16 @@ pre-start script
   if [ "$myCID" != "" ];
     then docker rm -v $myCID;
   fi
+  # Remove any data from previous container
+  rm -rf /data/dionaea/*
+  mkdir -p /data/dionaea/log /data/dionaea/bistreams /data/dionaea/binaries /data/dionaea/rtp /data/dionaea/wwwroot
+  chmod 760 /data/dionaea -R
+  chown tpot:tpot /data/dionaea -R
 end script
 script
-  # Delayed start to avoid rapid respawning
-  sleep $(((RANDOM % 5)+5))
-  /usr/bin/docker run --name dionaea --cap-add=NET_BIND_SERVICE --rm=true -p 21:21 -p 42:42 -p 8080:80 -p 135:135 -p 443:443 -p 445:445 -p 1433:1433 -p 3306:3306 -p 5061:5061 -p 5060:5060 -p 69:69/udp -p 5060:5060/udp -v /data/ews:/data/ews dtagdevsec/dionaea:latest1603
+  /usr/bin/docker run --name dionaea --cap-add=NET_BIND_SERVICE --rm=true -p 21:21 -p 42:42 -p 8080:80 -p 135:135 -p 443:443 -p 445:445 -p 1433:1433 -p 3306:3306 -p 5061:5061 -p 5060:5060 -p 69:69/udp -p 5060:5060/udp -v /data/dionaea:/data/dionaea -v /data/ews:/data/ews dtagdevsec/dionaea:latest1603
 end script
 post-start script
+  # Delay next start to avoid rapid respawning
   sleep $(((RANDOM % 5)+5))
 end script