diff --git a/deploy.sh b/deploy.sh index 8da51b4..7202200 100755 --- a/deploy.sh +++ b/deploy.sh @@ -255,7 +255,7 @@ for i in $(echo $PROXY_TYPE); do echo "No email address given, Let's Encrypt will not work properly." else TMP_FILE=$(mktemp -p /tmp/) - LETS_CONTENT=$(echo '"letsencrypt": {"EMAIL": "'$LETSENCRYPT_MAIL'","DOCKER_REGISTRY_URL": "'$DOCKER_REGISTRY_URL'"'}); + LETS_CONTENT=$(echo '"letsencrypt": {"EMAIL": "'$LETSENCRYPT_MAIL'","SERVERNAME": "'$LETSENCRYPT_SERVERNAME'","DOCKER_REGISTRY_URL": "'$DOCKER_REGISTRY_URL'"'}); if [[ -f $USER_CONFIG_PATH ]]; then TARGET=$(cat $USER_CONFIG_PATH | head -n-2); diff --git a/install.sh b/install.sh index b858308..45adbd8 100755 --- a/install.sh +++ b/install.sh @@ -60,6 +60,12 @@ ask_envs() { fi; echo "Invalid email address."; done + + echo "Please add letsencrypt server name (default is letsencrypt but you can add zerossl too):"; + read -r LETSENCRYPT_SERVERNAME; + if [ "$LETSENCRYPT_SERVERNAME" = "" ]; then + LETSENCRYPT_SERVERNAME="letsencrypt"; + fi; fi echo "Cron? (Y/n)"; @@ -465,22 +471,25 @@ ask_additionals() { break; fi; done + echo "Please add Guacamole admin password: "; while read -r -s GUACAMOLE_ADMIN_PASSWORD; do if [ "$GUACAMOLE_ADMIN_PASSWORD" != "" ]; then break; fi; done + echo "Do you want TOTP via login? (Y/n)"; - read -r -s TOTP_USE; - if [ "$TOTP_USE" == "" ] || [ "$TOTP_USE" == "y" ] || [ "$TOTP_USE" == "Y" ] ; then - TOTP_USE="true"; + read -r TOTP_USE; + if [ "$TOTP_USE" == "" ] || [ "$TOTP_USE" == "y" ] || [ "$TOTP_USE" == "Y" ] ; then + TOTP_USE="true"; fi; - 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"; - read -r -s BAN_DURATION; - if [ "$BAN_DURATION" == "" ] ; then - BAN_DURATION="5"; - fi; + + 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"; + read -r BAN_DURATION; + if [ "$BAN_DURATION" == "" ] ; then + BAN_DURATION="5"; + fi; fi } @@ -667,7 +676,9 @@ if [ ! -f "/etc/user/config/system.json" ]; then --volume $HOME/.ssh/installer:/root/.ssh/id_rsa \ --volume /etc/user/:/etc/user/ \ --volume /etc/system/:/etc/system/ \ - --env LETSENCRYPT_MAIL=$LETSENCRYPT_MAIL $DOCKER_REGISTRY_URL/installer-tool + --env LETSENCRYPT_MAIL=$LETSENCRYPT_MAIL \ + --env LETSENCRYPT_SERVERNAME=$LETSENCRYPT_SERVERNAME \ + $DOCKER_REGISTRY_URL/installer-tool fi;