This commit is contained in:
t3chn0m4g3 2016-10-23 13:38:44 +02:00
parent d3c5dad846
commit 93b00cb47a

View file

@ -48,12 +48,17 @@ exec > >(tee "install.log")
fuECHO "### Removing link to NGINX default website."
rm /etc/nginx/sites-enabled/default
# Let's wait a few seconds to avoid interference with service messages
fuECHO "### Waiting a few seconds to avoid interference with service messages."
sleep 5
# Let's ask user for a web user and password
fuECHO "### Please enter a web user name and password."
clear
myOK="n"
myUSER="tsec"
while [ 1 != 2 ]
do
fuECHO "### Please enter a web user name and password."
read -p "Username (tsec not allowed): " myUSER
echo "Your username is: "$myUSER
read -p "OK (y/n)? " myOK
@ -226,7 +231,7 @@ apt-get update -y
fuECHO "### Installing docker-engine."
fuECHO "### You can safely ignore the [FAILED] message,"
fuECHO "### which is caused by a bug in the docker installer."
apt-get install docker-engine=1.12.0-0~xenial -y || true && sleep 5
apt-get install docker-engine=1.12.2-0~xenial -y || true && sleep 5
# Let's add proxy settings to docker defaults
if [ -f $myPROXYFILEPATH ];