mirror of
https://github.com/telekom-security/tpotce.git
synced 2025-04-28 19:28:50 +00:00
fix volume bug & script
This commit is contained in:
parent
2c1d7ceae7
commit
94b1dda16f
11 changed files with 65 additions and 11 deletions
|
@ -4,7 +4,7 @@
|
||||||
# T-Pot Community Edition #
|
# T-Pot Community Edition #
|
||||||
# Check container and services script #
|
# Check container and services script #
|
||||||
# #
|
# #
|
||||||
# v0.13 by mo, DTAG, 2015-06-12 #
|
# v0.14 by mo, DTAG, 2015-08-07 #
|
||||||
########################################################
|
########################################################
|
||||||
if [ -a /var/run/check.lock ];
|
if [ -a /var/run/check.lock ];
|
||||||
then exit
|
then exit
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# T-Pot Community Edition #
|
# T-Pot Community Edition #
|
||||||
# Container and services restart script #
|
# Container and services restart script #
|
||||||
# #
|
# #
|
||||||
# v0.13 by mo, DTAG, 2015-02-19 #
|
# v0.14 by mo, DTAG, 2015-08-07 #
|
||||||
########################################################
|
########################################################
|
||||||
|
|
||||||
if [ -a /var/run/check.lock ];
|
if [ -a /var/run/check.lock ];
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
myCOUNT=1
|
myCOUNT=1
|
||||||
myIMAGES=$(cat /data/images.conf)
|
myIMAGES=$(cat /data/images.conf)
|
||||||
while true
|
while true
|
||||||
do
|
do
|
||||||
if ! [ -a /var/run/check.lock ];
|
if ! [ -a /var/run/check.lock ];
|
||||||
then break
|
then break
|
||||||
fi
|
fi
|
||||||
|
@ -33,7 +33,7 @@ echo "****************** $(date) ******************"
|
||||||
echo
|
echo
|
||||||
echo
|
echo
|
||||||
for i in $myIMAGES
|
for i in $myIMAGES
|
||||||
do
|
do
|
||||||
echo
|
echo
|
||||||
echo "======| Container:" $i "|======"
|
echo "======| Container:" $i "|======"
|
||||||
docker exec $i supervisorctl status | GREP_COLORS='mt=01;32' egrep --color=always "(RUNNING)|$" | GREP_COLORS='mt=01;31' egrep --color=always "(STOPPED|FATAL)|$"
|
docker exec $i supervisorctl status | GREP_COLORS='mt=01;32' egrep --color=always "(RUNNING)|$" | GREP_COLORS='mt=01;31' egrep --color=always "(STOPPED|FATAL)|$"
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# T-Pot Community Edition #
|
# T-Pot Community Edition #
|
||||||
# Dionaea upstart script #
|
# Dionaea upstart script #
|
||||||
# #
|
# #
|
||||||
# v0.50 by mo, DTAG, 2015-01-27 #
|
# v0.51 by mo, DTAG, 2015-08-07 #
|
||||||
########################################################
|
########################################################
|
||||||
|
|
||||||
description "Dionaea"
|
description "Dionaea"
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# T-Pot Community Edition #
|
# T-Pot Community Edition #
|
||||||
# ELK upstart script #
|
# ELK upstart script #
|
||||||
# #
|
# #
|
||||||
# v0.52 by mo, DTAG, 2015-02-20 #
|
# v0.53 by mo, DTAG, 2015-08-07 #
|
||||||
########################################################
|
########################################################
|
||||||
|
|
||||||
description "ELK"
|
description "ELK"
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# T-Pot Community Edition #
|
# T-Pot Community Edition #
|
||||||
# EWS upstart script #
|
# EWS upstart script #
|
||||||
# #
|
# #
|
||||||
# v0.51 by mo, DTAG, 2015-01-28 #
|
# v0.52 by mo, DTAG, 2015-08-07 #
|
||||||
########################################################
|
########################################################
|
||||||
|
|
||||||
description "EWS"
|
description "EWS"
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# T-Pot Community Edition #
|
# T-Pot Community Edition #
|
||||||
# Glastopf upstart script #
|
# Glastopf upstart script #
|
||||||
# #
|
# #
|
||||||
# v0.50 by mo, DTAG, 2015-01-27 #
|
# v0.51 by mo, DTAG, 2015-08-07 #
|
||||||
########################################################
|
########################################################
|
||||||
|
|
||||||
description "Glastopf"
|
description "Glastopf"
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# T-Pot Community Edition #
|
# T-Pot Community Edition #
|
||||||
# Honeytrap upstart script #
|
# Honeytrap upstart script #
|
||||||
# #
|
# #
|
||||||
# v0.50 by mo, DTAG, 2015-01-27 #
|
# v0.51 by mo, DTAG, 2015-08-07 #
|
||||||
########################################################
|
########################################################
|
||||||
|
|
||||||
description "Honeytrap"
|
description "Honeytrap"
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# T-Pot Community Edition #
|
# T-Pot Community Edition #
|
||||||
# Kippo upstart script #
|
# Kippo upstart script #
|
||||||
# #
|
# #
|
||||||
# v0.50 by mo, DTAG, 2015-01-27 #
|
# v0.51 by mo, DTAG, 2015-08-07 #
|
||||||
########################################################
|
########################################################
|
||||||
|
|
||||||
description "Kippo"
|
description "Kippo"
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# T-Pot Community Edition #
|
# T-Pot Community Edition #
|
||||||
# Suricata upstart script #
|
# Suricata upstart script #
|
||||||
# #
|
# #
|
||||||
# v0.50 by mo, DTAG, 2015-01-27 #
|
# v0.51 by mo, DTAG, 2015-08-07 #
|
||||||
########################################################
|
########################################################
|
||||||
|
|
||||||
description "Suricata"
|
description "Suricata"
|
||||||
|
|
54
tpot-volume-bugfix.sh
Executable file
54
tpot-volume-bugfix.sh
Executable file
|
@ -0,0 +1,54 @@
|
||||||
|
!/bin/bash
|
||||||
|
########################################################
|
||||||
|
# T-Pot Community Edition #
|
||||||
|
# Volume bug fix script #
|
||||||
|
# #
|
||||||
|
# v0.01 by mo, DTAG, 2015-08-07 #
|
||||||
|
########################################################
|
||||||
|
myFIXPATH="/tpot-volume-fix"
|
||||||
|
myLOCK="/var/run/check.lock"
|
||||||
|
myIMAGECONFPATH="/data/images.conf"
|
||||||
|
|
||||||
|
# Let's set check.lock to prevent the check scripts from execution
|
||||||
|
touch $myLOCK
|
||||||
|
|
||||||
|
# Since there are different versions out there let's update to the latest version first
|
||||||
|
apt-get update -y
|
||||||
|
apt-get upgrade -y
|
||||||
|
apt-get install lxc-docker -y
|
||||||
|
|
||||||
|
# Let's stop all docker and t-pot related services
|
||||||
|
for i in $(cat $myIMAGECONFPATH); do service $i stop; done
|
||||||
|
service docker stop
|
||||||
|
|
||||||
|
# Let's create a tmp and move some configs to prevent unwanted intervention
|
||||||
|
mkdir $myFIXPATH
|
||||||
|
for i in $(cat $myIMAGECONFPATH); do mv /etc/init/$i.conf $myFIXPATH; done
|
||||||
|
mv /etc/crontab $myFIXPATH
|
||||||
|
|
||||||
|
# Let's remove docker and all associated files
|
||||||
|
apt-get purge lxc-docker -y
|
||||||
|
apt-get autoremove -y
|
||||||
|
rm -rf /var/lib/docker/
|
||||||
|
rm -rf /var/run/docker/
|
||||||
|
|
||||||
|
# Let's reinstall docker again
|
||||||
|
apt-get install lxc-docker -y
|
||||||
|
|
||||||
|
# Let's pull the images
|
||||||
|
for i in $(cat $myIMAGECONFPATH); do /usr/bin/docker pull dtagdevsec/$i:latest; done
|
||||||
|
|
||||||
|
# Let's clone the tpotce repo and replace the buggy configs
|
||||||
|
git clone https://github.com/dtag-dev-sec/tpotce.git $myFIXPATH/tpotce/
|
||||||
|
cp $myFIXPATH/tpotce/installer/bin/check.sh /usr/bin/
|
||||||
|
cp $myFIXPATH/tpotce/installer/bin/dcres.sh /usr/bin/
|
||||||
|
for i in $(cat $myIMAGECONFPATH); do cp $myFIXPATH/tpotce/installer/upstart/$i.conf /etc/init/; done
|
||||||
|
cp $myFIXPATH/crontab /etc/
|
||||||
|
|
||||||
|
# Let's remove the check.lock and allow scripts to execute again
|
||||||
|
rm $myLOCK
|
||||||
|
|
||||||
|
# Let's start the services again
|
||||||
|
for i in $(cat $myIMAGECONFPATH); do service $i start && sleep 2; done
|
||||||
|
sleep 10
|
||||||
|
status.sh
|
Loading…
Reference in a new issue