Update installer

This commit is contained in:
t3chn0m4g3
2015-01-28 17:08:34 +01:00
parent 4e8ae8907f
commit bd4e58dca7
11 changed files with 147 additions and 59 deletions

View File

@ -4,38 +4,57 @@
# T-Pot Community Edition #
# Check container and services script #
# #
# v0.10 by mo, DTAG, 2015-01-27 #
# v0.11 by mo, DTAG, 2015-01-28 #
########################################################
if [ -f /var/run/check.lock ];
then exit
fi
myIMAGES=$(cat /data/images.conf)
touch /var/run/check.lock
myUPTIME=$(awk '{print int($1/60)}' /proc/uptime)
for i in dionaea elk ews glastopf honeytrap kippo suricata
do
myCIDSTATUS=$(docker exec -i $i supervisorctl status)
if [ $? -ne 0 ]; then
myCIDSTATUS=1
else
myCIDSTATUS=$(echo $myCIDSTATUS | egrep -c "(STOPPED|FATAL)")
fi
if [ $myCIDSTATUS -gt 0 ]; then
if [ $myUPTIME -gt 5 ]; then
service docker stop
docker rm $(docker ps -aq)
service docker start
for j in dionaea glastopf honeytrap kippo suricata ews elk
do
sleep 10
service $j start
done
rm /var/run/check.lock
exit 0
fi
fi
for i in $myIMAGES
do
myCIDSTATUS=$(docker exec -i $i supervisorctl status)
if [ $? -ne 0 ];
then
myCIDSTATUS=1
else
myCIDSTATUS=$(echo $myCIDSTATUS | egrep -c "(STOPPED|FATAL)")
fi
if [ $myCIDSTATUS -gt 0 ];
then
if [ $myUPTIME -gt 5 ];
then
for j in $myIMAGES
do
service $j stop
done
service docker restart
while true
do
docker info > /dev/null
if [ $? -ne 0 ];
then
echo Docker daemon is still starting.
else
echo Docker daemon is now available.
break
fi
sleep 0.1
done
docker rm $(docker ps -aq)
for j in $myIMAGES
do
service $j start
sleep $(((RANDOM %5)+5))
done
rm /var/run/check.lock
exit
fi
fi
done
rm /var/run/check.lock

47
installer/bin/dcres.sh Executable file
View File

@ -0,0 +1,47 @@
#!/bin/bash
########################################################
# T-Pot Community Edition #
# Container and services restart script #
# #
# v0.10 by mo, DTAG, 2015-01-28 #
########################################################
if [ -f /var/run/check.lock ];
then exit
fi
myIMAGES=$(cat /data/images.conf)
touch /var/run/check.lock
myUPTIME=$(awk '{print int($1/60)}' /proc/uptime)
if [ $myUPTIME -gt 5 ];
then
for i in $myIMAGES
do
service $i stop
done
service docker restart
while true
do
docker info > /dev/null
if [ $? -ne 0 ];
then
echo Docker daemon is still starting.
else
echo Docker daemon is now available.
break
fi
sleep 0.1
done
docker rm $(docker ps -aq)
for i in $myIMAGES
do
service $i start
sleep $(((RANDOM %5)+5))
done
fi
rm /var/run/check.lock

View File

@ -7,6 +7,7 @@
# v0.10 by mo, DTAG, 2015-01-27 #
########################################################
myCOUNT=1
myIMAGES=$(cat /data/images.conf)
while true
do
if ! [ -f /var/run/check.lock ];
@ -18,6 +19,12 @@ do
echo -n "Waiting for services "
else echo -n .
fi
if [ $myCOUNT = 300 ];
then
echo
echo "Services are busy or not available. Please retry later."
exit 1
fi
myCOUNT=$[$myCOUNT +1]
done
echo
@ -25,7 +32,7 @@ echo
echo "****************** $(date) ******************"
echo
echo
for i in dionaea elk ews glastopf honeytrap kippo suricata
for i in $myIMAGES
do
echo "======| Container:" $i "|======"
docker exec -i $i supervisorctl status | GREP_COLORS='mt=01;32' egrep --color=always "(RUNNING)|$" | GREP_COLORS='mt=01;31' egrep --color=always "(STOPPED|FATAL)|$"