diff options
| author | szaimen <szaimen@e.mail.de> | 2020-09-13 20:18:02 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-13 20:18:02 +0300 |
| commit | eda50026fd10430dd8d5c6b0eb2bb28eb6deba6f (patch) | |
| tree | 7ba175e906a1abee1165b976ef99933889c533ac /apps/collabora_docker.sh | |
| parent | fa3e1e5d5a60331ed662d5d952e9203082d239a4 (diff) | |
create input_box_flow (#1449)
Co-authored-by: Daniel Hansson <github@hanssonit.se>
Diffstat (limited to 'apps/collabora_docker.sh')
| -rw-r--r-- | apps/collabora_docker.sh | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/apps/collabora_docker.sh b/apps/collabora_docker.sh index d63d35a2..0261217b 100644 --- a/apps/collabora_docker.sh +++ b/apps/collabora_docker.sh @@ -42,14 +42,7 @@ then # If yes, then stop and prune the docker container docker_prune_this 'collabora/code' # Revoke LE - while : - do - SUBDOMAIN=$(input_box "Please enter the subdomain you are using for Collabora, e.g: office.yourdomain.com") - if yesno_box_yes "Is this correct? $SUBDOMAIN" - then - break - fi - done + SUBDOMAIN=$(input_box_flow "Please enter the subdomain you are using for Collabora, e.g: office.yourdomain.com") if [ -f "$CERTFILES/$SUBDOMAIN/cert.pem" ] then yes no | certbot revoke --cert-path "$CERTFILES/$SUBDOMAIN/cert.pem" @@ -106,14 +99,7 @@ if does_this_docker_exist 'onlyoffice/documentserver' then docker_prune_this 'onlyoffice/documentserver' # Revoke LE - while : - do - SUBDOMAIN=$(input_box "Please enter the subdomain you are using for OnlyOffice, e.g: office.yourdomain.com") - if yesno_box_yes "Is this correct? $SUBDOMAIN" - then - break - fi - done + SUBDOMAIN=$(input_box_flow "Please enter the subdomain you are using for OnlyOffice, e.g: office.yourdomain.com") if [ -f "$CERTFILES/$SUBDOMAIN/cert.pem" ] then yes no | certbot revoke --cert-path "$CERTFILES/$SUBDOMAIN/cert.pem" @@ -157,15 +143,7 @@ then fi # Ask for the domain for Collabora -while : -do - # Collabora URL - SUBDOMAIN=$(input_box "Collabora subdomain e.g: office.yourdomain.com\n\nNOTE: This domain must be different than your Nextcloud domain. They can however be hosted on the same server, but would require seperate DNS entries.") - if yesno_box_yes "Is this correct? $SUBDOMAIN" - then - break - fi -done + SUBDOMAIN=$(input_box_flow "Collabora subdomain e.g: office.yourdomain.com\n\nNOTE: This domain must be different than your Nextcloud domain. They can however be hosted on the same server, but would require seperate DNS entries.") # Nextcloud Main Domain NCDOMAIN=$(occ_command_no_check config:system:get overwrite.cli.url | sed 's|https://||;s|/||') |