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

tweaking

Browse source
This commit is contained in:
t3chn0m4g3 2019-02-12 20:29:13 +01:00
parent 8a6b7bc53e
commit 93d2ebabda
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iso/installer/install.sh
View file

@ -543,7 +543,7 @@ npm install https://github.com/taskrabbit/elasticsearch-dump -g 2>&1 | dialog --
pip install --upgrade pip 2>&1 | dialog --keep-window --title "[ Installing pip ]" $myPROGRESSBOXCONF pip install --upgrade pip 2>&1 | dialog --keep-window --title "[ Installing pip ]" $myPROGRESSBOXCONF
hash -r 2>&1 | dialog --keep-window --title "[ Installing pip ]" $myPROGRESSBOXCONF hash -r 2>&1 | dialog --keep-window --title "[ Installing pip ]" $myPROGRESSBOXCONF
pip install elasticsearch-curator yq 2>&1 | dialog --keep-window --title "[ Installing elasticsearch-curator, yq ]" $myPROGRESSBOXCONF pip install elasticsearch-curator yq 2>&1 | dialog --keep-window --title "[ Installing elasticsearch-curator, yq ]" $myPROGRESSBOXCONF
wget https://github.com/bcicen/ctop/releases/download/v0.7.1/ctop-0.7.1-linux-amd64 -O /usr/bin/ctop 2>&1 | dialog --keep-window --title "[ Installing ctop ]" $myPROGRESSBOXCONF wget https://github.com/bcicen/ctop/releases/download/v0.7.2/ctop-0.7.2-linux-amd64 -O /usr/bin/ctop 2>&1 | dialog --keep-window --title "[ Installing ctop ]" $myPROGRESSBOXCONF
chmod +x /usr/bin/ctop 2>&1 | dialog --keep-window --title "[ Installing ctop ]" $myPROGRESSBOXCONF chmod +x /usr/bin/ctop 2>&1 | dialog --keep-window --title "[ Installing ctop ]" $myPROGRESSBOXCONF
git clone https://github.com/dtag-dev-sec/tpotce -b debian /opt/tpot 2>&1 | dialog --keep-window --title "[ Cloning T-Pot ]" $myPROGRESSBOXCONF git clone https://github.com/dtag-dev-sec/tpotce -b debian /opt/tpot 2>&1 | dialog --keep-window --title "[ Cloning T-Pot ]" $myPROGRESSBOXCONF

13
update.sh
View file

@ -58,7 +58,7 @@ function fuSELFUPDATE () {
echo "###### $myBLUE""No updates found in repository.""$myWHITE" echo "###### $myBLUE""No updates found in repository.""$myWHITE"
return return
fi fi
myRESULT=$(git diff --name-only origin/master | grep update.sh) myRESULT=$(git diff --name-only origin/debian | grep update.sh)
if [ "$myRESULT" == "update.sh" ]; if [ "$myRESULT" == "update.sh" ];
then then
echo "###### $myBLUE""Found newer version, will be pulling updates and restart myself.""$myWHITE" echo "###### $myBLUE""Found newer version, will be pulling updates and restart myself.""$myWHITE"
@ -76,8 +76,8 @@ echo
# Let's check for version # Let's check for version
function fuCHECK_VERSION () { function fuCHECK_VERSION () {
local myMINVERSION="18.04.0" local myMINVERSION="19.03.0"
local myMASTERVERSION="18.11.0" local myMASTERVERSION="19.03.0"
echo echo
echo "### Checking for version tag ..." echo "### Checking for version tag ..."
if [ -f "version" ]; if [ -f "version" ];
@ -185,12 +185,11 @@ npm install "https://github.com/taskrabbit/elasticsearch-dump" -g
pip install --upgrade pip pip install --upgrade pip
hash -r hash -r
pip install --upgrade elasticsearch-curator yq pip install --upgrade elasticsearch-curator yq
wget https://github.com/bcicen/ctop/releases/download/v0.7.1/ctop-0.7.1-linux-amd64 -O /usr/bin/ctop && chmod +x /usr/bin/ctop wget https://github.com/bcicen/ctop/releases/download/v0.7.2/ctop-0.7.2-linux-amd64 -O /usr/bin/ctop && chmod +x /usr/bin/ctop
echo echo
echo "### Now replacing T-Pot related config files on host" echo "### Now replacing T-Pot related config files on host"
cp host/etc/systemd/* /etc/systemd/system/ cp host/etc/systemd/* /etc/systemd/system/
cp host/etc/issue /etc/
systemctl daemon-reload systemctl daemon-reload
echo echo
@ -234,7 +233,7 @@ echo "### Now pulling latest docker images"
echo "######$myBLUE This might take a while, please be patient!$myWHITE" echo "######$myBLUE This might take a while, please be patient!$myWHITE"
fuPULLIMAGES 2>&1>/dev/null fuPULLIMAGES 2>&1>/dev/null
fuREMOVEOLDIMAGES "1804" #fuREMOVEOLDIMAGES "1804"
echo "### If you made changes to tpot.yml please ensure to add them again." echo "### If you made changes to tpot.yml please ensure to add them again."
echo "### We stored the previous version as backup in /root/." echo "### We stored the previous version as backup in /root/."
echo "### Done, please reboot." echo "### Done, please reboot."
@ -267,7 +266,7 @@ fi
fuCHECK_VERSION fuCHECK_VERSION
fuCONFIGCHECK fuCONFIGCHECK
fuCHECKINET "https://index.docker.io https://github.com https://pypi.python.org https://ubuntu.com" fuCHECKINET "https://index.docker.io https://github.com https://pypi.python.org https://debian.org"
fuSTOP_TPOT fuSTOP_TPOT
fuBACKUP fuBACKUP
fuSELFUPDATE "$0" "$@" fuSELFUPDATE "$0" "$@"

2
version
View file

@ -1 +1 @@
18.11.0 19.03.0