diff --git a/additional_install.sh b/additional_install.sh index 25f514b..3eaccd7 100755 --- a/additional_install.sh +++ b/additional_install.sh @@ -103,6 +103,8 @@ if [[ "$GUACAMOLE" == "yes" ]]; then 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/TOTP_USE/$TOTP_USE/g" /tmp/guacamole/guacamole-secret.json; + sed -i "s/BAN_DURATION/$BAN_DURATION/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 08872db..3935521 100755 --- a/install.sh +++ b/install.sh @@ -420,6 +420,18 @@ ask_additionals() { break; fi; done + echo "Do you want TOTP via login? (Y/n)"; + while read -r -s TOTP_USE; do + if [ "$TOTP_USE" == "" ] || [ "$TOTP_USE" == "y" ] || [ "$TOTP_USE" == "Y" ] ; then + TOTP_USE="true"; + fi; + done + echo "Do you want limitation in case invalid login or password? Please add a number how many minutes for deny retry. If you add 0 means it will disabled. If just press enter means limitation will be set 5 minutes by default"; + while read -r -s BAN_DURATION; do + if [ "$BAN_DURATION" == "" ] ; then + BAN_DURATION="5"; + fi; + done fi } @@ -701,6 +713,8 @@ if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then VAR_GUACAMOLE="$VAR_GUACAMOLE --env GUACAMOLE_DOMAIN=$GUACAMOLE_DOMAIN"; VAR_GUACAMOLE="$VAR_GUACAMOLE --env GUACAMOLE_ADMIN_NAME=$GUACAMOLE_ADMIN_NAME"; VAR_GUACAMOLE="$VAR_GUACAMOLE --env GUACAMOLE_ADMIN_PASSWORD=$GUACAMOLE_ADMIN_PASSWORD"; + VAR_GUACAMOLE="$VAR_GUACAMOLE --env TOTP_USE=$TOTP_USE"; + VAR_GUACAMOLE="$VAR_GUACAMOLE --env BAN_DURATION=$BAN_DURATION"; ADDITIONAL_SERVICES=""; echo "Would you like to run Guacamole after install? (Y/n)";