From 1efaadbf77bbce7ff1dd3edace8b03f5b8dfbeb7 Mon Sep 17 00:00:00 2001 From: Chase Wright Date: Fri, 1 Dec 2017 11:55:22 -0600 Subject: [PATCH] Updated Password Logic --- docker-install.sh | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/docker-install.sh b/docker-install.sh index c961fbe..2c838f9 100644 --- a/docker-install.sh +++ b/docker-install.sh @@ -3,9 +3,29 @@ VERSION="0.9.13" -read -s -p "Enter the password that will be used for MySQL Root: " MYSQLROOTPASSWORD +# Get MySQL root password and Guacamole User password +echo +while true +do + read -s -p "Enter a MySQL ROOT Password: " mysqlrootpassword + echo + read -s -p "Confirm MySQL ROOT Password: " password2 + echo + [ "$mysqlrootpassword" = "$password2" ] && break + echo "Passwords don't match. Please try again." + echo +done echo -read -s -p "Enter the password that will be used for the Guacamole database: " GUACDBUSERPASSWORD +while true +do + read -s -p "Enter a Guacamole User Database Password: " guacdbuserpassword + echo + read -s -p "Confirm Guacamole User Database Password: " password2 + echo + [ "$guacdbuserpassword" = "$password2" ] && break + echo "Passwords don't match. Please try again." + echo +done echo #Install Stuff @@ -20,7 +40,7 @@ wget -O guacamole-auth-jdbc-${VERSION}-incubating.tar.gz ${SERVER}/binary/guacam tar -xzf guacamole-auth-jdbc-${VERSION}-incubating.tar.gz # Start MySQL -docker run --restart=always --detach --name=mysql --env="MYSQL_ROOT_PASSWORD=$MYSQLROOTPASSWORD" --publish 3306:3306 mysql +docker run --restart=always --detach --name=mysql --env="MYSQL_ROOT_PASSWORD=$mysqlrootpassword" --publish 3306:3306 mysql # Sleep to let MySQL load (there's probably a better way to do this) echo "Waiting 30 seconds for MySQL to load" @@ -35,11 +55,11 @@ GRANT SELECT,INSERT,UPDATE,DELETE ON guacamole_db.* TO 'guacamole_user'@'%'; flush privileges;" # Execute SQL Code -echo $SQLCODE | mysql -h 127.0.0.1 -P 3306 -u root -p$MYSQLROOTPASSWORD +echo $SQLCODE | mysql -h 127.0.0.1 -P 3306 -u root -p$mysqlrootpassword -cat guacamole-auth-jdbc-${VERSION}-incubating/mysql/schema/*.sql | mysql -u root -p$MYSQLROOTPASSWORD -h 127.0.0.1 -P 3306 guacamole_db +cat guacamole-auth-jdbc-${VERSION}-incubating/mysql/schema/*.sql | mysql -u root -p$mysqlrootpassword -h 127.0.0.1 -P 3306 guacamole_db docker run --restart=always --name guacd -d guacamole/guacd -docker run --restart=always --name guacamole --link mysql:mysql --link guacd:guacd -e MYSQL_HOSTNAME=127.0.0.1 -e MYSQL_DATABASE=guacamole_db -e MYSQL_USER=guacamole_user -e MYSQL_PASSWORD=$GUACDBUSERPASSWORD --detach -p 8080:8080 guacamole/guacamole +docker run --restart=always --name guacamole --link mysql:mysql --link guacd:guacd -e MYSQL_HOSTNAME=127.0.0.1 -e MYSQL_DATABASE=guacamole_db -e MYSQL_USER=guacamole_user -e MYSQL_PASSWORD=$guacdbuserpassword --detach -p 8080:8080 guacamole/guacamole rm -rf guacamole-auth-jdbc-${VERSION}-incubating*