diff --git a/installer/data/elkbase.tgz b/installer/data/elkbase.tgz index febe8cd7..3ca38f40 100644 Binary files a/installer/data/elkbase.tgz and b/installer/data/elkbase.tgz differ diff --git a/installer/etc/nginx/tpotweb.conf b/installer/etc/nginx/tpotweb.conf index c0652029..28266416 100644 --- a/installer/etc/nginx/tpotweb.conf +++ b/installer/etc/nginx/tpotweb.conf @@ -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; diff --git a/installer/install.sh b/installer/install.sh index e3525020..4d0a083f 100755 --- a/installer/install.sh +++ b/installer/install.sh @@ -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." diff --git a/installer/usr/share/nginx/html/navbar.html b/installer/usr/share/nginx/html/navbar.html index 49527a37..e97eb19b 100644 --- a/installer/usr/share/nginx/html/navbar.html +++ b/installer/usr/share/nginx/html/navbar.html @@ -9,7 +9,7 @@
- Home + Home Kibana ES Head Plugin UI-For-Docker diff --git a/installer/usr/share/nginx/html/index.html b/installer/usr/share/nginx/html/tpotweb.html similarity index 100% rename from installer/usr/share/nginx/html/index.html rename to installer/usr/share/nginx/html/tpotweb.html