Alex-Devera/tpotce
1
0
Fork 0
mirror of https://github.com/telekom-security/tpotce.git synced 2025-07-01 12:32:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix bugs

Browse source
This commit is contained in:
t3chn0m4g3 2018-09-12 13:42:00 +00:00
parent 14c9585b7e
commit 0ba2258d5c
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
bin/tped.sh
View file

@ -5,6 +5,17 @@ myBACKTITLE="T-Pot Edition Selection Tool"
myYMLS=$(cd /opt/tpot/etc/compose/ && ls -1 *.yml) myYMLS=$(cd /opt/tpot/etc/compose/ && ls -1 *.yml)
myLINK="/opt/tpot/etc/tpot.yml" myLINK="/opt/tpot/etc/tpot.yml"
# Let's load docker images in parallel
function fuPULLIMAGES {
local myTPOTCOMPOSE="/opt/tpot/etc/tpot.yml"
for name in $(cat $myTPOTCOMPOSE | grep -v '#' | grep image | cut -d'"' -f2 | uniq)
do
docker pull $name &
done
wait
echo
}
# setup menu # setup menu
for i in $myYMLS; for i in $myYMLS;
do do
@ -20,10 +31,13 @@ dialog --backtitle "$myBACKTITLE" --title "[ Activate now? ]" --yesno "\n$myEDIT
myOK=$? myOK=$?
if [ "$myOK" == "0" ]; if [ "$myOK" == "0" ];
then then
echo "OK - Activating" echo "OK - Activating and downloading latest images."
systemctl stop tpot systemctl stop tpot
docker stop $(docker ps -aq)
docker rm $(docker ps -aq)
rm -f $myLINK rm -f $myLINK
ln -s /opt/tpot/etc/compose/$myEDITION $myLINK ln -s /opt/tpot/etc/compose/$myEDITION $myLINK
fuPULLIMAGES
systemctl start tpot systemctl start tpot
echo "Done. Use \"dps.sh\" for monitoring" echo "Done. Use \"dps.sh\" for monitoring"
else else

2
iso/installer/install.sh
View file

@ -679,7 +679,7 @@ myCRONJOBS="
*/1 * * * * root mv --backup=numbered /data/dionaea/roots/ftp/* /data/dionaea/binaries/ */1 * * * * root mv --backup=numbered /data/dionaea/roots/ftp/* /data/dionaea/binaries/
# Daily reboot # Daily reboot
27 3 * * * root reboot 27 3 * * * root systemctl stop tpot && docker stop $(docker ps -aq) && docker rm $(docker ps -aq) && reboot
# Check for updated packages every sunday, upgrade and reboot # Check for updated packages every sunday, upgrade and reboot
27 16 * * 0 root apt-get autoclean -y && apt-get autoremove -y && apt-get update -y && apt-get upgrade -y && sleep 10 && reboot 27 16 * * 0 root apt-get autoclean -y && apt-get autoremove -y && apt-get update -y && apt-get upgrade -y && sleep 10 && reboot

3
update.sh
View file

@ -112,6 +112,9 @@ if [ $? -ne 0 ];
exit 1 exit 1
else else
echo "[ $myGREEN"OK"$myWHITE ]" echo "[ $myGREEN"OK"$myWHITE ]"
echo "###### $myBLUE Now cleaning up containers.$myWHITE "
docker stop $(docker ps -aq)
docker rm $(docker ps -aq)
fi fi
echo echo
} }