From 84ca4ee9266d1cbb97b536fe95e913c8a9efe60e Mon Sep 17 00:00:00 2001 From: gyurix Date: Thu, 3 Aug 2023 15:33:05 +0000 Subject: [PATCH] added guacamole admin user and password to additional install script --- additional_install.sh | 2 ++ install.sh | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/additional_install.sh b/additional_install.sh index e629497..25f514b 100755 --- a/additional_install.sh +++ b/additional_install.sh @@ -101,6 +101,8 @@ if [[ "$GUACAMOLE" == "yes" ]]; then git clone ssh://$GIT_REPO/$ORGANIZATION/guacamole.git /tmp/guacamole; sed -i "s/DOMAIN_NAME/$GUACAMOLE_DOMAIN/g" /tmp/guacamole/guacamole-secret.json; + sed -i "s/GUACAMOLE_ADMIN_NAME/$GUACAMOLE_ADMIN_NAME/g" /tmp/guacamole/guacamole-secret.json; + sed -i "s/GUACAMOLE_ADMIN_PASSWORD/$GUACAMOLE_ADMIN_PASSWORD/g" /tmp/guacamole/guacamole-secret.json; sed -i "s/DB_MYSQL/$DB_MYSQL/g" /tmp/guacamole/guacamole-secret.json; sed -i "s/DB_USER/$DB_USER/g" /tmp/guacamole/guacamole-secret.json; sed -i "s/DB_PASSWORD/$DB_PASSWORD/g" /tmp/guacamole/guacamole-secret.json; diff --git a/install.sh b/install.sh index 5d55fbc..08872db 100755 --- a/install.sh +++ b/install.sh @@ -699,8 +699,8 @@ if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then if [ "$GUACAMOLE" == "yes" ]; then VAR_GUACAMOLE="--env GUACAMOLE=$GUACAMOLE"; VAR_GUACAMOLE="$VAR_GUACAMOLE --env GUACAMOLE_DOMAIN=$GUACAMOLE_DOMAIN"; - VAR_GUACAMOLE="$VAR_GUACAMOLE --env ADMIN_NAME=$GUACAMOLE_ADMIN_NAME"; - VAR_GUACAMOLE="$VAR_GUACAMOLE --env ADMIN_PASSWORD=$GUACAMOLE_ADMIN_PASSWORD"; + VAR_GUACAMOLE="$VAR_GUACAMOLE --env GUACAMOLE_ADMIN_NAME=$GUACAMOLE_ADMIN_NAME"; + VAR_GUACAMOLE="$VAR_GUACAMOLE --env GUACAMOLE_ADMIN_PASSWORD=$GUACAMOLE_ADMIN_PASSWORD"; ADDITIONAL_SERVICES=""; echo "Would you like to run Guacamole after install? (Y/n)";