diff --git a/installer/bin/check.sh b/installer/bin/check.sh index aab2d6e9..f7bf7e7a 100755 --- a/installer/bin/check.sh +++ b/installer/bin/check.sh @@ -4,9 +4,9 @@ # T-Pot Community Edition # # Check container and services script # # # -# v0.11 by mo, DTAG, 2015-01-28 # +# v0.12 by mo, DTAG, 2015-01-29 # ######################################################## -if [ -f /var/run/check.lock ]; +if [ -a /var/run/check.lock ]; then exit fi @@ -32,6 +32,7 @@ for i in $myIMAGES do service $j stop done + iptables -w -F service docker restart while true do diff --git a/installer/bin/dcres.sh b/installer/bin/dcres.sh index cf920ab3..19e857a9 100755 --- a/installer/bin/dcres.sh +++ b/installer/bin/dcres.sh @@ -4,10 +4,10 @@ # T-Pot Community Edition # # Container and services restart script # # # -# v0.10 by mo, DTAG, 2015-01-28 # +# v0.11 by mo, DTAG, 2015-01-29 # ######################################################## -if [ -f /var/run/check.lock ]; +if [ -a /var/run/check.lock ]; then exit fi @@ -22,6 +22,7 @@ if [ $myUPTIME -gt 5 ]; do service $i stop done + iptables -w -F service docker restart while true do diff --git a/installer/bin/status.sh b/installer/bin/status.sh index 288ec8bf..6df06ec7 100755 --- a/installer/bin/status.sh +++ b/installer/bin/status.sh @@ -10,7 +10,7 @@ myCOUNT=1 myIMAGES=$(cat /data/images.conf) while true do - if ! [ -f /var/run/check.lock ]; + if ! [ -a /var/run/check.lock ]; then break fi sleep 0.1 diff --git a/installer/upstart/ews.conf b/installer/upstart/ews.conf index 7a870676..c17790c1 100644 --- a/installer/upstart/ews.conf +++ b/installer/upstart/ews.conf @@ -20,5 +20,5 @@ end script script # Delayed start to avoid rapid respawning sleep $(((RANDOM % 5)+5)) - /usr/bin/docker run --name ews --volumes-from dionaea --volumes-from glastopf --volumes-from honeytrap --volumes-from kippo --rm=true -v /data/ews/:/data/ews/ --link kippo:kippo dtagdevsec/ews + /usr/bin/docker run --name ews --volumes-from dionaea --volumes-from glastopf --volumes-from honeytrap --volumes-from kippo --rm=true -v /data/ews/conf/:/data/ews/conf/ -v /data/ews/ --link kippo:kippo dtagdevsec/ews end script