From 14794ca1859ee87f36bd357ca35253fffe76ba71 Mon Sep 17 00:00:00 2001 From: Daniel Hansson Date: Fri, 12 Mar 2021 02:27:08 +0100 Subject: [PATCH] add some more info and fix typos (#1888) --- CHANGELOG.md | 2 +- addons/desec.sh | 5 +++-- apps/previewgenerator.sh | 2 +- issue_template.md | 4 ++-- menu/nextcloud_configuration.sh | 2 +- menu/server_configuration.sh | 2 +- menu/startup_configuration.sh | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3edf4511..2abfd370 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -198,7 +198,7 @@ PR's are more than welcome. Happy Nextclouding! - Make Adminer work on HTTP/2 - Introduce fetch_lib and chain libaries - this is now the new way of fetching the libs - Add more menu scripts -- Add more Yes/No boxes and fix occurances where the text wasn't shown due to print_text_in_color +- Add more Yes/No boxes and fix occurrences where the text wasn't shown due to print_text_in_color - Standardize Whiptails even more - Change to TLS1.2 all over - Make functions out of all special variables diff --git a/addons/desec.sh b/addons/desec.sh index b606187a..7fa39b33 100644 --- a/addons/desec.sh +++ b/addons/desec.sh @@ -42,9 +42,9 @@ msg_box "You will now be prompted to enter an email address. It's very important Every 6 months you will get an email asking you to confirm your domain. If you don't react within a few weeks, your domain will be destroyed!" -msg_box "Please note: If you already created an account with deSEC you can't use the same email adress in this script as you won't get an email with a captcha. In that case, please use your already existing account to setup your domain at the deSEC website. +msg_box "Please note: If you already created an account with deSEC you can't use the same email address in this script as you won't get an email with a captcha. In that case, please use your already existing account to setup your domain at the deSEC website. -Another option is to use another email address in this setup, and then email the deSEC suport that you want to merge your two accounts together, or delete the first one. +Another option is to use another email address in this setup, and then email the deSEC support that you want to merge your two accounts together, or delete the first one. In other words, the email address used in this script has to be uniqe, and can not be registred with deSEC since before." @@ -81,6 +81,7 @@ do fi else break + msg_box "$DEDYNDOMAIN was successfully setup with deSEC! Now please continue with the DDNS and TLS setup for the domain." fi done diff --git a/apps/previewgenerator.sh b/apps/previewgenerator.sh index b0320d4d..7c596bd1 100644 --- a/apps/previewgenerator.sh +++ b/apps/previewgenerator.sh @@ -238,7 +238,7 @@ fi msg_box "In the last step you can define a specific Nextcloud user for \ which will be the user that runs the Preview Generation. -The default behaviour (just hit [ENTER]) is to run with the \ +The default behavior (just hit [ENTER]) is to run with the \ system user 'www-data' which will generate previews for all users. If you on the other hand choose to use a specific user, previews will ONLY be generated for that specific user." diff --git a/issue_template.md b/issue_template.md index a4ef6d81..8a28751e 100644 --- a/issue_template.md +++ b/issue_template.md @@ -14,10 +14,10 @@ Thank you! 2. 3. -## Expected behaviour +## Expected behavior Tell us what should happen -## Actual behaviour +## Actual behavior Tell us what happens instead ## Server configuration diff --git a/menu/nextcloud_configuration.sh b/menu/nextcloud_configuration.sh index 5c749dcc..3424aa43 100644 --- a/menu/nextcloud_configuration.sh +++ b/menu/nextcloud_configuration.sh @@ -48,7 +48,7 @@ case "$choice" in other users appear in a folder named 'Shared' in the Nextcloud GUI. If you don't enable this option, all shares will appear directly in \ -the Nextcloud GUI root folder, which is the default behaviour." "$SUBTITLE" +the Nextcloud GUI root folder, which is the default behavior." "$SUBTITLE" if yesno_box_yes "Do you want to enable this option?" "$SUBTITLE" then nextcloud_occ config:system:set share_folder --value="/Shared" diff --git a/menu/server_configuration.sh b/menu/server_configuration.sh index 9f662f66..e1998061 100644 --- a/menu/server_configuration.sh +++ b/menu/server_configuration.sh @@ -48,7 +48,7 @@ choice=$(whiptail --title "$TITLE" --checklist \ $CHECKLIST_GUIDE\n\n$RUN_LATER_GUIDE" "$WT_HEIGHT" "$WT_WIDTH" 4 \ "Static IP" "(Set static IP in Ubuntu with netplan.io)" OFF \ "Security" "(Add extra security based on this http://goo.gl/gEJHi7)" OFF \ -"deSEC" "(Automatically get a domain from desec.io, configure ddclient and activate TLS)" "$STARTUP_SWITCH" \ +"deSEC" "(Automatically setup a dedyn.io domain, together with DDNS and TLS)" "$STARTUP_SWITCH" \ "DDclient Configuration" "(Use ddclient for automatic DDNS updates)" OFF \ "Activate TLS" "(Enable HTTPS with Let's Encrypt)" "$ACTIVATE_TLS_SWITCH" \ "GeoBlock" "(Only allow certain countries to access your server)" OFF \ diff --git a/menu/startup_configuration.sh b/menu/startup_configuration.sh index 47379beb..5c30dee9 100644 --- a/menu/startup_configuration.sh +++ b/menu/startup_configuration.sh @@ -15,7 +15,7 @@ debug_mode # Update the lib once during the startup script # TODO: delete this again e.g. with NC 20.0.1 -# download_script GITHUB_REPO lib #### removed in 21.0.0, delete it completley in a later version +# download_script GITHUB_REPO lib #### removed in 21.0.0, delete it completely in a later version # Must be root root_check