fix bugs, prepare for rc

This commit is contained in:
t3chn0m4g3 2016-10-23 14:54:57 +02:00
parent 93b00cb47a
commit 40c2b2c386
4 changed files with 15 additions and 9 deletions

View file

@ -1,6 +1,6 @@
[![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg?maxAge=2592000)](https://gitter.im/dtag-dev-sec/tpotce) [![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg?maxAge=2592000)](https://gitter.im/dtag-dev-sec/tpotce)
# T-Pot 16.10 Image Creator (beta) # T-Pot 16.10 Image Creator
This repository contains the necessary files to create the **[T-Pot community honeypot](http://dtag-dev-sec.github.io/)** ISO image. This repository contains the necessary files to create the **[T-Pot community honeypot](http://dtag-dev-sec.github.io/)** 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.

View file

@ -7,8 +7,6 @@
# v16.10.0 by mo, DTAG, 2016-05-12 # # v16.10.0 by mo, DTAG, 2016-05-12 #
######################################################## ########################################################
echo "### I still need some dev-work!"
# Make sure not to interrupt a check # Make sure not to interrupt a check
while true while true
do do

View file

@ -1,4 +1,4 @@
T-Pot 16.10 (beta) T-Pot 16.10
Hostname: \n Hostname: \n
___________ _____________________________ ___________ _____________________________

View file

@ -53,7 +53,6 @@ fuECHO "### Waiting a few seconds to avoid interference with service messages."
sleep 5 sleep 5
# Let's ask user for a web user and password # Let's ask user for a web user and password
clear
myOK="n" myOK="n"
myUSER="tsec" myUSER="tsec"
while [ 1 != 2 ] while [ 1 != 2 ]
@ -62,7 +61,7 @@ while [ 1 != 2 ]
read -p "Username (tsec not allowed): " myUSER read -p "Username (tsec not allowed): " myUSER
echo "Your username is: "$myUSER echo "Your username is: "$myUSER
read -p "OK (y/n)? " myOK read -p "OK (y/n)? " myOK
if [ "$myOK" = "y" ] && [ "$myUSER" != "tsec" ]; if [ "$myOK" = "y" ] && [ "$myUSER" != "tsec" ] && [ "$myUSER" != "" ];
then then
break break
fi fi
@ -70,11 +69,20 @@ while [ 1 != 2 ]
myPASS1="pass1" myPASS1="pass1"
myPASS2="pass2" myPASS2="pass2"
while [ "$myPASS1" != "$myPASS2" ] while [ "$myPASS1" != "$myPASS2" ]
do
while [ "$myPASS1" == "pass1" ] || [ "$myPASS1" == "" ]
do do
read -s -p "Password: " myPASS1 read -s -p "Password: " myPASS1
echo echo
done
read -s -p "Repeat password: " myPASS2 read -s -p "Repeat password: " myPASS2
echo echo
if [ "$myPASS1" != "$myPASS2" ];
then
fuECHO "### Passwords do not match."
myPASS1="pass1"
myPASS2="pass2"
fi
done done
htpasswd -b -c /etc/nginx/nginxpasswd $myUSER $myPASS1 htpasswd -b -c /etc/nginx/nginxpasswd $myUSER $myPASS1