diff --git a/install.php b/install.php index 4fc36b0..b0d4682 100644 --- a/install.php +++ b/install.php @@ -46,6 +46,22 @@ putenv('DISCOVERY='.$_POST["discovery"]); putenv('ADDITIONAL='.$_POST["additional"]); + + + # $NEXTCLOUD_DOMAIN" != "" ]; then + # $NEXTCLOUD_USERNAME" != "" ]; then + # $NEXTCLOUD_PASSWORD" != "" ]; then + # $BITWARDEN_DOMAIN" != "" ]; then + # $SMTP_SERVER" != "" ]; then + # $SMTP HOST + # $SMTP_PORT" != "" ]; then + # $SMTP_SECURITY" != "" ]; then + # $SMTP_FROM" != "" ]; then + # $SMTP_USERNAME" != "" ]; then + # $SMTP_PASSWORD" != "" ]; then + # $DOMAINS_WHITELIST" != "" ]; then + + // check ENV variables $output = shell_exec("set"); echo "
".$output."
"; diff --git a/install.sh b/install.sh index ebaf2aa..b705ba2 100755 --- a/install.sh +++ b/install.sh @@ -351,105 +351,8 @@ ask_additionals() { SERVICE_DIR="/etc/user/config/services"; fi - 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: "; - while read -r NEXTCLOUD_DOMAIN; do - if [ "$NEXTCLOUD_DOMAIN" != "" ]; then - break; - fi; - done - echo "Please add Nextcloud username: "; - while read -r NEXTCLOUD_USERNAME; do - if [ "$NEXTCLOUD_USERNAME" != "" ]; then - break; - fi; - done - echo "Please add Nextcloud password: "; - while read -r -s NEXTCLOUD_PASSWORD; do - if [ "$NEXTCLOUD_PASSWORD" != "" ]; then - break; - fi; - done - fi - - 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: "; - while read -r BITWARDEN_DOMAIN; do - if [ "$BITWARDEN_DOMAIN" != "" ]; then - break; - fi; - done - - echo "Please choose an SMTP server (1/2/3): "; - echo "1 - Gmail"; - echo "2 - Microsoft Outlook/Hotmail"; - echo "3 - Other"; - while read -r SMTP_SERVER; do - if [ "$SMTP_SERVER" != "" ]; then - break; - fi; - done - - if [ "$SMTP_SERVER" == "3" ]; then - echo "Please add SMTP HOST: "; - while read -r SMTP_HOST; do - if [ "$SMTP_HOST" != "" ]; then - break; - fi; - done - - echo "Please add SMTP PORT (587, 465, 25, etc.): "; - while read -r SMTP_PORT; do - if [ "$SMTP_PORT" != "" ]; then - break; - fi; - done - - echo "Please add SMTP SECURITY (starttls, force_tls, off, etc.): "; - while read -r SMTP_SECURITY; do - if [ "$SMTP_SECURITY" != "" ]; then - break; - fi; - done - fi - - echo "Please add SMTP FROM (mail address from): "; - while read -r SMTP_FROM; do - if [ "$SMTP_FROM" != "" ]; then - break; - fi; - done - - echo "Please add SMTP USERNAME: "; - while read -r SMTP_USERNAME; do - if [ "$SMTP_USERNAME" != "" ]; then - break; - fi; - done - - echo "Please add SMTP PASSWORD: "; - while read -r -s SMTP_PASSWORD; do - if [ "$SMTP_PASSWORD" != "" ]; then - break; - fi; - done - - echo "Please add Domains Whitelist (list of domains): "; - while read -r DOMAINS_WHITELIST; do - if [ "$DOMAINS_WHITELIST" != "" ]; then - break; - fi; - done - - fi + NEXTCLOUD="yes"; + BITWARDEN="yes"; echo "Do you want to install Guacamole? (Y/n)"; read -r ANSWER;