Alex-Devera/tpotce
1
0
Fork 0
mirror of https://github.com/telekom-security/tpotce.git synced 2025-04-20 06:02:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix bugs, issues

Browse source 
fix an issue with nginx upgrades where index.html was overwritten without asking
fix an issue with dashboards where positions were mixed up after removing welcome message and saving as default
This commit is contained in:
t3chn0m4g3 2016-10-27 11:11:51 +00:00
parent 8966eb5a98
commit 091025fcfb
5 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
installer/data/elkbase.tgz
View file

Binary file not shown.

1
installer/etc/nginx/tpotweb.conf
View file

@ -13,6 +13,7 @@ server {
### Basic server settings
#########################
listen 64297 ssl http2;
index tpotweb.html;
ssl_protocols TLSv1.2;
server_name example.com;
error_page 300 301 302 400 401 402 403 404 500 501 502 503 504 /error.html;

15
installer/install.sh
View file

@ -3,7 +3,7 @@
# T-Pot post install script #
# Ubuntu server 16.04.0, x64 #
# #
# v16.10.0 by mo, DTAG, 2016-10-25 #
# v16.10.0 by mo, DTAG, 2016-10-27 #
########################################################
# Some global vars
@ -41,9 +41,12 @@ set -e
exec 2> >(tee "install.err")
exec > >(tee "install.log")
# Let's disable NGINX default website
fuECHO "### Removing link to NGINX default website."
# Let's remove NGINX default website
fuECHO "### Removing NGINX default website."
rm /etc/nginx/sites-enabled/default
rm /etc/nginx/sites-available/default
rm /usr/share/nginx/html/index.html
nginx -s reload
# Let's wait a few seconds to avoid interference with service messages
fuECHO "### Waiting a few seconds to avoid interference with service messages."
@ -106,7 +109,9 @@ while [ 1 != 2 ]
fuECHO "### Please enter a web user name and password."
read -p "Username (tsec not allowed): " myUSER
echo "Your username is: "$myUSER
fuECHO
read -p "OK (y/n)? " myOK
fuECHO
if [ "$myOK" = "y" ] && [ "$myUSER" != "tsec" ] && [ "$myUSER" != "" ];
then
break
@ -119,10 +124,10 @@ while [ "$myPASS1" != "$myPASS2" ]
while [ "$myPASS1" == "pass1" ] || [ "$myPASS1" == "" ]
do
read -s -p "Password: " myPASS1
echo
fuECHO
done
read -s -p "Repeat password: " myPASS2
echo
fuECHO
if [ "$myPASS1" != "$myPASS2" ];
then
fuECHO "### Passwords do not match."

2
installer/usr/share/nginx/html/navbar.html
View file

@ -9,7 +9,7 @@
<body bgcolor="#E20074">
<center>
<a href="/index.html" target="_top" class="btn">Home</a>
<a href="/tpotweb.html" target="_top" class="btn">Home</a>
<a href="/kibana/" target="main" class="btn">Kibana</a>
<a href="/myhead/_plugin/head/" target="main" class="btn">ES Head Plugin</a>
<a href="/ui/" target="main" class="btn">UI-For-Docker</a>

0
installer/usr/share/nginx/html/index.html → installer/usr/share/nginx/html/tpotweb.html
View file