From a829e7d6cadc51cc9f373cf4790f69e5f554cf25 Mon Sep 17 00:00:00 2001 From: hael Date: Fri, 14 Jul 2023 14:34:17 +0000 Subject: [PATCH] Guacamole was addedd --- additional_install.sh | 23 +++++++++++++++++++++++ install.sh | 39 +++++++++++++++++++++++++++++++++------ 2 files changed, 56 insertions(+), 6 deletions(-) diff --git a/additional_install.sh b/additional_install.sh index ed74e3e..e629497 100755 --- a/additional_install.sh +++ b/additional_install.sh @@ -92,6 +92,29 @@ if [[ "$BITWARDEN" == "yes" ]]; then #cp -rv /tmp/bitwarden/firewall-bitwarden-smtp.json $SERVICE_DIR/firewall-bitwarden-smtp.json; fi; +if [[ "$GUACAMOLE" == "yes" ]]; then + + DB_MYSQL="$(echo $RANDOM | md5sum | head -c 8)"; + DB_USER="$(echo $RANDOM | md5sum | head -c 8)"; + DB_PASSWORD="$(echo $RANDOM | md5sum | head -c 10)"; + DB_ROOT_PASSWORD="$(echo $RANDOM | md5sum | head -c 10)"; + + 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/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; + sed -i "s/DB_ROOT_PASSWORD/$DB_ROOT_PASSWORD/g" /tmp/guacamole/guacamole-secret.json; + sed -i "s/DOMAIN_NAME/$GUACAMOLE_DOMAIN/g" /tmp/guacamole/domain-guacamole.json + + cp -rv /tmp/guacamole/guacamole-secret.json /etc/user/secret/guacamole.json; + + cp -rv /tmp/guacamole/guacamole.json $SERVICE_DIR/guacamole.json; + cp -rv /tmp/guacamole/domain-guacamole.json $SERVICE_DIR/domain-guacamole.json; + cp -rv /tmp/guacamole/firewall-guacamole.json $SERVICE_DIR/firewall-guacamole.json; +fi; + + #if [[ "$NEXTCLOUD" == "yes" ] || [ "$BITWARDEN" == "yes" ]]; then # echo "SMTP service install has started from ssh://$GIT_REPO/$ORGANIZATION/smtp.git"; # diff --git a/install.sh b/install.sh index e15aa74..91f22ef 100755 --- a/install.sh +++ b/install.sh @@ -296,24 +296,24 @@ ask_additionals() { fi - echo "Do you want to install nextcloud? (Y/n)"; + echo "Do you want to install Nextcloud? (Y/n)"; read -r ANSWER; if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then NEXTCLOUD="yes"; - echo "Please add nextcloud domain: "; + echo "Please add Nextcloud domain: "; while read -r NEXTCLOUD_DOMAIN; do if [ "$NEXTCLOUD_DOMAIN" != "" ]; then break; fi; done - echo "Please add nextcloud username: "; + echo "Please add Nextcloud username: "; while read -r NEXTCLOUD_USERNAME; do if [ "$NEXTCLOUD_USERNAME" != "" ]; then break; fi; done - echo "Please add nextcloud password: "; + echo "Please add Nextcloud password: "; while read -r -s NEXTCLOUD_PASSWORD; do if [ "$NEXTCLOUD_PASSWORD" != "" ]; then break; @@ -321,12 +321,12 @@ ask_additionals() { done fi - echo "Do you want to install bitwarden? (Y/n)"; + echo "Do you want to install Bitwarden? (Y/n)"; read -r ANSWER; if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then BITWARDEN="yes"; - echo "Please add bitwarden domain: "; + echo "Please add Bitwarden domain: "; while read -r BITWARDEN_DOMAIN; do if [ "$BITWARDEN_DOMAIN" != "" ]; then break; @@ -396,6 +396,19 @@ ask_additionals() { fi + echo "Do you want to install Guacamole? (Y/n)"; + read -r ANSWER; + if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then + GUACAMOLE="yes"; + + echo "Please add Guacamole domain: "; + while read -r GUACAMOLE_DOMAIN; do + if [ "$GUACAMOLE_DOMAIN" != "" ]; then + break; + fi; + done + fi + } uninstall() { @@ -667,12 +680,26 @@ if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then fi fi + if [ "$GUACAMOLE" == "yes" ]; then + VAR_GUACAMOLE="--env GUACAMOLE=$GUACAMOLE"; + VAR_GUACAMOLE="$VAR_GUACAMOLE --env GUACAMOLE_DOMAIN=$GUACAMOLE_DOMAIN"; + + ADDITIONAL_SERVICES=""; + echo "Would you like to run Guacamole after install? (Y/n)"; + read -r ANSWER; + if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ] ; then + ADDITIONAL_SERVICES="$ADDITIONAL_SERVICES guacamole"; + fi + fi + + # Run installer tool $SUDO_CMD docker run \ --env ADDITIONALS=true \ --env SERVICE_DIR=$SERVICE_DIR\ $VAR_NEXTCLOUD \ $VAR_BITWARDEN \ + $VAR_GUACAMOLE \ --volume $HOME/.ssh/installer:/root/.ssh/id_rsa \ --volume /etc/user/:/etc/user/ \ --volume /etc/system/:/etc/system/ \