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

Cleanup and prep for Beta

Browse source 
- remove some files from merge
- prepare for beta
This commit is contained in:
t3chn0m4g3 2017-10-19 11:02:59 +02:00
parent a15d79780d
commit b71f2f67f4
6 changed files with 10 additions and 5877 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -1,4 +1,4 @@
# T-Pot 17.10 (Alpha) # T-Pot 17.10 (Beta)
This repository contains the necessary files to create the **[T-Pot](https://github.com/dtag-dev-sec/tpotce/releases)** ISO image. This repository contains the necessary files to create the **[T-Pot](https://github.com/dtag-dev-sec/tpotce/releases)** ISO image.
The image can then be used to install T-Pot on a physical or virtual machine. The image can then be used to install T-Pot on a physical or virtual machine.
@ -6,7 +6,7 @@ The image can then be used to install T-Pot on a physical or virtual machine.
In October 2016 we released In October 2016 we released
[T-Pot 16.10](http://dtag-dev-sec.github.io/mediator/feature/2016/10/31/t-pot-16.10.html) [T-Pot 16.10](http://dtag-dev-sec.github.io/mediator/feature/2016/10/31/t-pot-16.10.html)
# T-Pot 17.10 (Alpha - be careful there may be dragons!) # T-Pot 17.10 (Beta)
T-Pot 17.10 uses latest 16.04 LTS Ubuntu Server Network Installer image, is based on T-Pot 17.10 uses latest 16.04 LTS Ubuntu Server Network Installer image, is based on

1466
installer/usr/share/dict/a.txt
View file

File diff suppressed because it is too large Load diff

4401
installer/usr/share/dict/n.txt
View file

File diff suppressed because it is too large Load diff

2
iso/installer/install.sh
View file

@ -337,7 +337,7 @@ npm install https://github.com/t3chn0m4g3/elasticsearch-dump -g 2>&1 | dialog --
wget https://github.com/bcicen/ctop/releases/download/v0.6.1/ctop-0.6.1-linux-amd64 -O ctop 2>&1 | dialog --title "[ Installing ctop ]" $myPROGRESSBOXCONF wget https://github.com/bcicen/ctop/releases/download/v0.6.1/ctop-0.6.1-linux-amd64 -O ctop 2>&1 | dialog --title "[ Installing ctop ]" $myPROGRESSBOXCONF
mv ctop /usr/bin/ 2>&1 | dialog --title "[ Installing ctop ]" $myPROGRESSBOXCONF mv ctop /usr/bin/ 2>&1 | dialog --title "[ Installing ctop ]" $myPROGRESSBOXCONF
chmod +x /usr/bin/ctop 2>&1 | dialog --title "[ Installing ctop ]" $myPROGRESSBOXCONF chmod +x /usr/bin/ctop 2>&1 | dialog --title "[ Installing ctop ]" $myPROGRESSBOXCONF
git clone https://github.com/dtag-dev-sec/tpotce -b 17.06 /opt/tpot 2>&1 | dialog --title "[ Cloning T-Pot ]" $myPROGRESSBOXCONF git clone https://github.com/dtag-dev-sec/tpotce /opt/tpot 2>&1 | dialog --title "[ Cloning T-Pot ]" $myPROGRESSBOXCONF
# Let's add a new user # Let's add a new user
addgroup --gid 2000 tpot 2>&1 | dialog --title "[ Adding new user ]" $myPROGRESSBOXCONF addgroup --gid 2000 tpot 2>&1 | dialog --title "[ Adding new user ]" $myPROGRESSBOXCONF

2
iso/isolinux/txt.cfg
View file

@ -1,6 +1,6 @@
default install default install
label install label install
menu label ^T-Pot 17.10 (Alpha) menu label ^T-Pot 17.10 (Beta)
menu default menu default
kernel linux kernel linux
append vga=788 initrd=initrd.gz console-setup/ask_detect=true -- append vga=788 initrd=initrd.gz console-setup/ask_detect=true --

12
update.sh
View file

@ -24,7 +24,7 @@ fi
function fuCONFIGCHECK () { function fuCONFIGCHECK () {
echo "### Checking for T-Pot configuration file ..." echo "### Checking for T-Pot configuration file ..."
echo -n "###### $myBLUE$myCONFIGFILE$myWHITE " echo -n "###### $myBLUE$myCONFIGFILE$myWHITE "
if ! [ -f $myCONFIGFILE ]; if ! [ -f $myCONFIGFILE ];
then then
echo echo
echo $myRED"Error - No T-Pot configuration file present." echo $myRED"Error - No T-Pot configuration file present."
@ -66,7 +66,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/17.06 | grep update.sh) myRESULT=$(git diff --name-only origin/master | grep update.sh)
myLOCALSTAT=$(git status -uno | grep -c update.sh) myLOCALSTAT=$(git status -uno | grep -c update.sh)
if [ "$myRESULT" == "update.sh" ]; if [ "$myRESULT" == "update.sh" ];
then then
@ -85,14 +85,14 @@ function fuSELFUPDATE () {
else else
echo "###### Update script is already up-to-date." echo "###### Update script is already up-to-date."
git pull --force git pull --force
fi fi
} }
# Only run with command switch # Only run with command switch
if [ "$1" != "-y" ]; then if [ "$1" != "-y" ]; then
echo "This script will update / upgrade all T-Pot related scripts, tools and packages" echo "This script will update / upgrade all T-Pot related scripts, tools and packages"
echo "Some of your changes might be overwritten, so make sure to save your work" echo "Some of your changes might be overwritten, so make sure to save your work"
echo "This feature is still experimental, run with \"-y\" switch" echo "This feature is still experimental, run with \"-y\" switch"
echo echo
exit exit
fi fi