diff --git a/addons/automatic_updates.sh b/addons/automatic_updates.sh index 388a57d3..7fae7a38 100644 --- a/addons/automatic_updates.sh +++ b/addons/automatic_updates.sh @@ -9,7 +9,7 @@ source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercont SCRIPT_EXPLAINER="This option will update your server every week on Saturdays at $AUT_UPDATES_TIME:00. The update will run the built in script '$SCRIPTS/update.sh' which will update both the server packages and Nextcloud itself.\n You can read more about it here: https://www.techandme.se/nextcloud-update-is-now-fully-automated/ -Please keep in mind that automatic updates might fail hence it's \ +Please keep in mind that automatic updates might fail, which is why it's \ important to have a proper backup in place if you plan to run this option." # Check for errors + debug code and abort if something isn't right @@ -46,6 +46,6 @@ then echo "exit" >> "$SCRIPTS"/update.sh fi -msg_box "Please remember to keep backups in case something goes wrong, you never know." +msg_box "Please remember to keep backups in case something goes wrong, as you never know." exit diff --git a/addons/locate_mirror.sh b/addons/locate_mirror.sh index 31deb7b8..937b2256 100644 --- a/addons/locate_mirror.sh +++ b/addons/locate_mirror.sh @@ -18,11 +18,11 @@ fi # Check where the best mirrors are and update msg_box "To make downloads as fast as possible when updating Ubuntu \ -you should have download mirrors that are as close to you as possible. +you should download mirrors that are as geographically close to you as possible. Please note that there are no guarantees that the download mirrors \ -this script will find are staying up for the lifetime of this server. -Because of this, we don't recommend to change the mirror, except you live far away from the default mirror. +this script finds will remain for the lifetime of this server. +Because of this, we don't recommend that you change the mirror unless you live far away from the default. This is the method used: https://github.com/jblakeman/apt-select" msg_box "Your current server repository is: $REPO" diff --git a/addons/smtp-mail.sh b/addons/smtp-mail.sh index e875b5ad..d7824131 100644 --- a/addons/smtp-mail.sh +++ b/addons/smtp-mail.sh @@ -215,7 +215,7 @@ ALIASES_CONF # Store message in a variable TEST_MAIL="Congratulations! -Since this email reached you, it seems like everything is working properly. :) +Given this email reached you, it seems like everything is working properly. :) To change the settings please check /etc/msmtprc on your server, or simply just run the setup script again. diff --git a/apps/bitwarden-rs.sh b/apps/bitwarden-rs.sh index b7334001..68b6b58e 100644 --- a/apps/bitwarden-rs.sh +++ b/apps/bitwarden-rs.sh @@ -22,7 +22,7 @@ root_check if [ -d /home/bitwarden_rs ] || docker ps -a --format '{{.Names}}' | grep -Eq "bitwarden_rs"; then msg_box "It seems like you have already installed Bitwarden RS. -You cannot install it again because you would loose all your data and passwords. +You cannot install it again because you would lose all your data and passwords. If you are certain that you definitely want to delete Bitwarden RS and all \ its data to be able to reinstall it, you can execute the following commands: @@ -68,7 +68,7 @@ SUBDOMAIN=$(input_box_flow "Please enter the Domain that you want to use for Bit source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Inform the user -msg_box "Before continuing, please make sure that you have you have \ +msg_box "Before continuing, please make sure that you have \ edited the DNS settings for $SUBDOMAIN, and opened port 80 and 443 \ directly to this servers IP. A full extensive guide can be found here: https://www.techandme.se/open-port-80-443 @@ -304,7 +304,7 @@ do msg_box "Bitwarden_rs with fail2ban have been successfully installed! Please visit https://$SUBDOMAIN/admin to manage all your settings. -Attention! Please note down the password for the admin panel: $ADMIN_PASS +Attention! Please note the password for the admin panel: $ADMIN_PASS Otherwise you will not have access to your Bitwarden_rs installation and have to reinstall it completely! It is highly recommended to configure and test the smtp settings for mails first. diff --git a/apps/bitwarden-rs_admin-panel.sh b/apps/bitwarden-rs_admin-panel.sh index ecfbc04a..d63f0b4c 100644 --- a/apps/bitwarden-rs_admin-panel.sh +++ b/apps/bitwarden-rs_admin-panel.sh @@ -60,8 +60,8 @@ case "$choice" in print_text_in_color "$ICyan" "Starting bitwarden_rs..." docker start bitwarden_rs msg_box "The admin-panel for Bitwarden_rs is now enabled.\n -Please note down the new admin-panel password: $ADMIN_PASS\n -Otherwise you will not be able to login to the admin-panel.\n +Please note the new admin-panel password: $ADMIN_PASS\n +Otherwise you will be unable to login to the admin-panel.\n To change the password again, you can simply run this option (enable admin-panel) again." ;; *) diff --git a/apps/tmbitwarden.sh b/apps/tmbitwarden.sh index 9b8829f4..2552957c 100644 --- a/apps/tmbitwarden.sh +++ b/apps/tmbitwarden.sh @@ -35,7 +35,7 @@ then if [ -d /root/bwdata ] || [ -d "$BITWARDEN_HOME"/bwdata ] then msg_box "It seems like Bitwarden is already installed. -You cannot install it again because you would loose all your data and passwords. +You cannot install it again because you would lose all your data and passwords. If you are certain that you definitely want to delete Bitwarden and all its data to be able to reinstall it, you can execute the following commands: diff --git a/lib.sh b/lib.sh index f7e3b604..b6e19325 100644 --- a/lib.sh +++ b/lib.sh @@ -209,7 +209,7 @@ if ! is_root then msg_box "Sorry, you are not root. You now have two options: -1. With SUDO directly: +1. Use SUDO directly: a) :~$ sudo bash $SCRIPTS/name-of-script.sh 2. Become ROOT and then type your command: @@ -350,7 +350,7 @@ removal_popup() { then print_text_in_color "$ICyan" "Reinstalling $1..." else - msg_box "It seems like neither Uninstall nor Reinstall is chosen, \ + msg_box "It seems like neither Uninstall nor Reinstall was selected, \ something is wrong here. Please report this to $ISSUES" exit 1 fi @@ -363,7 +363,7 @@ get_newest_dat_files() { | grep -oP '202[0-9]-[01][0-9]-Maxmind-Country-IPv4\.dat' | sort -r | head -1) if [ -z "$IPV4_NAME" ] then - print_text_in_color "$IRed" "Could not get the newest IPv4 name. Not updating the .dat file" + print_text_in_color "$IRed" "Could not get the latest IPv4 name. Not updating the .dat file" sleep 1 else if ! [ -f "$SCRIPTS/$IPV4_NAME" ] @@ -388,7 +388,7 @@ get_newest_dat_files() { | grep -oP '202[0-9]-[01][0-9]-Maxmind-Country-IPv6\.dat' | sort -r | head -1) if [ -z "$IPV6_NAME" ] then - print_text_in_color "$IRed" "Could not get the newest IPv6 name. Not updating the .dat file" + print_text_in_color "$IRed" "Could not get the latest IPv6 name. Not updating the .dat file" sleep 1 else if ! [ -f "$SCRIPTS/$IPV6_NAME" ] @@ -464,15 +464,15 @@ domain_check_200() { else msg_box "DNS lookup failed with dig. The external IP ($WANIP4) \ address of this server is not the same as the A-record ($DIG). -Please check your DNS settings! Maybe the domain isn't propagated? +Please check your DNS settings! Maybe the domain hasn't propagated? Please check https://www.whatsmydns.net/#A/${1} if the IP seems correct." msg_box "As you noticed your WAN IP and DNS record doesn't match. \ -This can happen when using DDNS for example, or in some edge cases. +This can happen when using DDNS for example, or in other edge cases. If you feel brave, or are sure that everything is setup correctly, \ then you can choose to skip this test in the next step. -You can always contact us for further support if you wish: \ +If needed, you can always contact us for further support: \ https://shop.hanssonit.se/product/premium-support-per-30-minutes/" if ! yesno_box_no "Do you feel brave and want to continue?" then @@ -565,14 +565,14 @@ print_text_in_color "$ICyan" "Automatically configures pm.max_children for php-f if [ $PHP_FPM_MAX_CHILDREN -lt $min_max_children ] then msg_box "The current max_children value available to set is \ -$PHP_FPM_MAX_CHILDREN, and with that value PHP-FPM won't function properly. -The minimum value is 8, and the value is calculated depening on how much RAM you have left to use in the system. +$PHP_FPM_MAX_CHILDREN, and PHP-FPM won't function properly with that value. +The minimum value is 8, and the value is calculated depening on how much available RAM you have left. The absolute minimum amount of RAM required to run the VM is 2 GB, but we recommend 4 GB. You now have two choices: -1. Import this VM again, raise the amount of RAM with at least 1 GB, and then run this script again, - installing it in the same way as you did before. +1. Import this VM again, raise the amount of RAM with at least 1 GB, and run this script + in the same way as you just have. 2. Import this VM again without raising the RAM, but don't install any of the following apps: 1) Collabora 2) OnlyOffice @@ -635,7 +635,7 @@ if ! version 18.04 "$DISTRO" 20.04.6 then print_text_in_color "$IRed" "Your current Ubuntu version is $DISTRO but must be between \ 18.04 - 20.04.4 to run this script." - print_text_in_color "$ICyan" "Please contact us to get support for upgrading your server:" + print_text_in_color "$ICyan" "Please contact us for support upgrading your server:" print_text_in_color "$ICyan" "https://www.hanssonit.se/#contact" print_text_in_color "$ICyan" "https://shop.hanssonit.se/" sleep 300 @@ -663,7 +663,7 @@ then check_command systemctl restart systemd-networkd && sleep 2 if ! nslookup github.com then - msg_box "Network NOT OK. You must have a working network connection to run this script. + msg_box "Network is NOT OK. You must have a working network connection to run this script. If you think that this is a bug, please report it to https://github.com/nextcloud/vm/issues." return 1 fi @@ -688,8 +688,8 @@ fi check_nextcloud_https() { if ! nextcloud_occ_no_check config:system:get overwrite.cli.url | grep -q "https" then - msg_box "Sorry, but Nextcloud needs to be run on HTTPS which doesn't seem to be the case here. -You easily activate TLS (HTTPS) by running the Let's Encrypt script. + msg_box "Sorry, but Nextcloud needs to be run on HTTPS. +You can easily activate TLS (HTTPS) by running the Let's Encrypt script. More info here: https://bit.ly/37wRCin To run this script again, just exectue 'sudo bash $SCRIPTS/menu.sh' and choose: @@ -753,10 +753,10 @@ do elif [ "$f" != "${methods[$((${#methods[*]} - 1))]}" ] then msg_box "It seems like no certs were generated when trying \ -to validate them with the $f method. We will do more tries." +to validate them with the $f method. We will retry." else msg_box "It seems like no certs were generated when trying \ -to validate them with the $f method. We have tried all the methods. Please check your DNS and try again." +to validate them with the $f method. We have exhausted all the methods. Please check your DNS and try again." return 1; fi done @@ -822,11 +822,11 @@ then print_text_in_color "$IGreen" "Port ${1} is open on ${2}!" else msg_box "It seems like the port ${1} is closed. This could happened when your -ISP has blocked the port, or that the port isn't open. +ISP has blocked the port, or the port isn't open. -If you are 100% sure the port ${1} is open you can now choose to -continue. There are no guarantees that it will work anyway though, -since the service depend on that the port ${1} is open and +If you are 100% sure the port ${1} is open, you can choose to +continue. There are no guarantees that it will work though, +since the service depends on port ${1} being open and accessible from outside your network." if ! yesno_box_no "Are you 100% sure the port ${1} is open?" then @@ -919,7 +919,7 @@ To bypass this check, comment out (add # before the line) 'ram_check X' in the s In nextcloud_install_production.sh you can find the check somewhere around line #98. -Please note that things may be very slow and not work as expected. YOU HAVE BEEN WARNED!" +Please note this may affect performance. USE AT YOUR OWN RISK!" exit 1 else print_text_in_color "$IGreen" "RAM for ${2} OK! ($mem_available_gb GB)" @@ -1006,7 +1006,7 @@ then if ! site_200 github.com then # sleep 30 seconds so that some REALLY slow networks have time to restart - countdown 'Not online yet, waiting a bit more (last try)...' 30 + countdown 'Not online yet, waiting a bit more (final attempt)...' 30 site_200 github.com fi fi @@ -1107,7 +1107,7 @@ if network_ok then curl -fSLO --retry 3 "$NCREPO"/"$STABLEVERSION".tar.bz2 else - msg_box "There seems to be an issue with your network, please try again later.\nThis script will exit." + msg_box "There seems to be an issue with your network, please try again later.\nThis script will now exit." exit 1 fi # Checksum of the downloaded file @@ -1244,7 +1244,7 @@ if [ "${CURRENTVERSION%%.*}" -lt "$1" ] then msg_box "This script is developed to work with Nextcloud $1 and later. This means we can't use our own script for now. But don't worry, -we automated the update process and we will now use Nextclouds updater instead. +we automated the update process and we will now use Nextcloud's updater instead. Press [OK] to continue the update, or press [CTRL+C] to abort. @@ -1282,7 +1282,7 @@ if [ "${CURRENTVERSION%%.*}" -ge "$1" ] then sleep 1 else - msg_box "Your current version are still not compatible with the version required to run this script. + msg_box "Your current version is still not compatible with the version required to run this script. To upgrade between major versions, please check this out: https://shop.hanssonit.se/product/upgrade-between-major-owncloud-nextcloud-versions/" @@ -1548,7 +1548,7 @@ then return 1 elif [ -z "$POOLNAME" ] then - print_text_in_color "$IRed" "It seems like the POOLNAME variable is empty, we can't continue without it." + print_text_in_color "$IRed" "Please define the POOLNAME variable, as we can't continue without it." return 1 fi # Import zpool in case missing diff --git a/nextcloud-startup-script.sh b/nextcloud-startup-script.sh index 38d68be1..6bfa5bc0 100644 --- a/nextcloud-startup-script.sh +++ b/nextcloud-startup-script.sh @@ -107,7 +107,7 @@ then Since the Home/SME server is equipped with a Wi-Fi module, you will now be asked to enable it to get connectivity. -Please note: It's not recommended to run a server on Wi-Fi. Using an ethernet cable is always the best." +Please note: It's not recommended to run a server on Wi-Fi; using an ethernet cable is always the best." if yesno_box_yes "Do you want to enable Wi-Fi on this server?" then nmtui @@ -116,7 +116,7 @@ Please note: It's not recommended to run a server on Wi-Fi. Using an ethernet ca then print_text_in_color "$IGreen" "Online!" else - msg_box "Network NOT OK. You must have a working network connection to run this script. + msg_box "Network is NOT OK. You must have a working network connection to run this script. Please contact us for support: https://shop.hanssonit.se/product/premium-support-per-30-minutes/ @@ -125,7 +125,7 @@ Please also post this issue on: https://github.com/nextcloud/vm/issues" exit 1 fi else - msg_box "Network NOT OK. You must have a working network connection to run this script. + msg_box "Network is NOT OK. You must have a working network connection to run this script. Please contact us for support: https://shop.hanssonit.se/product/premium-support-per-30-minutes/ @@ -176,7 +176,7 @@ then else if [ -z "$UNIXUSER" ] then - msg_box "You seem to be running this as the pure root user. + msg_box "You seem to be running this as the root user. You must run this as a regular user with sudo permissions. Please create a user with sudo permissions and the run this command: @@ -202,8 +202,8 @@ fi ######## The first setup is OK to run to this point several times, but not any further ######## if [ -f "$SCRIPTS/you-can-not-run-the-startup-script-several-times" ] then - msg_box "The $SCRIPT_NAME script that handles the first setup \ -(this one) is designed to be run once, not several times in a row. + msg_box "The $SCRIPT_NAME script that handles this first setup \ +is designed to be run once, not several times in a row. If you feel uncertain about adding some extra features during this setup, \ then it's best to wait until after the first setup is done. You can always add all the extra features later. @@ -212,7 +212,7 @@ then it's best to wait until after the first setup is done. You can always add a Please delete this VM from your host and reimport it once again, then run this setup like you did the first time. [For the Nextcloud Home/SME Server:] -It's a bit more tricky since you can't revert in the same way as with a VM. \ +It's a bit trickier since you can't revert in the same way as a VM. \ The best thing you can do now is to save all the output from the session you \ ran before this one + write down all the steps you took and send and email to: github@hanssonit.se with the subject 'Issues with first setup', and we'll take it from there. @@ -275,7 +275,7 @@ It will also do the following: - Install selected apps and automatically configure them - Detect and set hostname - Detect and set trusted domains -- Detect the best Ubuntu mirrors depending on your location +- Detect the best Ubuntu mirrors based on your location - Upgrade your system and Nextcloud to latest version - Set secure permissions to Nextcloud - Set new passwords to Linux and Nextcloud @@ -422,7 +422,7 @@ unset NC_ADMIN_USER msg_box "Well done, you have now finished most of the setup. -There are still some stuff left to do, but they are automated so sit back and relax! :)" +There are still a few steps left but they are automated so sit back and relax! :)" # Add default notifications notify_admin_gui \ diff --git a/nextcloud_install_production.sh b/nextcloud_install_production.sh index b6c2e894..366412aa 100644 --- a/nextcloud_install_production.sh +++ b/nextcloud_install_production.sh @@ -240,8 +240,8 @@ then else msg_box "This server is designed to run with two disks, one for OS and one for DATA. \ This will get you the best performance since the second disk is using ZFS which is a superior filesystem. -You could still choose to only run on one disk though, which is not recommended, \ -but maybe your only option depending on which hypervisor you are running. +Though not recommended, you can still choose to only run on one disk, \ +if for example it's your only option on the hypervisor you're running. You will now get the option to decide which disk you want to use for DATA, \ or run the automatic script that will choose the available disk automatically." @@ -953,6 +953,6 @@ if [ -z "$PROVISIONING" ] then msg_box "Installation almost done, system will reboot when you hit OK. -Please log in again once rebooted to run the setup script." +After reboot, please login to run the setup script." fi reboot diff --git a/nextcloud_update.sh b/nextcloud_update.sh index ef801bde..e30e5e5a 100644 --- a/nextcloud_update.sh +++ b/nextcloud_update.sh @@ -33,7 +33,7 @@ is_process_running dpkg if does_snapshot_exist "NcVM-snapshot-pending" then msg_box "It seems like the last update was not successful. -Cannot proceed because you would loose the last snapshot." +Cannot proceed, as you would lose the last snapshot." exit 1 fi @@ -71,8 +71,8 @@ This should work again after a reboot of your server." notify_admin_gui "Update failed!" \ "Could not create NcVM-snapshot - Please reboot your server! $(date +%T)" msg_box "The creation of a snapshot failed. -If you just merged and old one, please reboot your server once more. -It should work afterwards again." +If you just merged and old one, please reboot your server again. +It should then start working again." exit 1 fi nextcloud_occ maintenance:mode --off @@ -85,8 +85,8 @@ if [ -d /boot ] then if [[ "$(df -h | grep -m 1 /boot | awk '{print $5}' | cut -d "%" -f1)" -gt 90 ]] then - msg_box "It seems like your boot drive is filled more than 90%. \ -You can't proceed to upgrade since it probably will break your system + msg_box "It seems like your boot drive is more than 90% full. \ +You can't proceed to upgrade, as it would likely break your system. To be able to proceed with the update you need to delete some old Linux kernels. If you need support, please visit: https://shop.hanssonit.se/product/premium-support-per-30-minutes/" @@ -321,7 +321,7 @@ then docker image prune -a -f docker volume prune -f notify_admin_gui "Watchtower removed" "Due to compatibility issues with Bitwarden and Watchtower, \ -we have removed Watchtower from this server. Updates will now happen for each container seperatly instead." +we have removed Watchtower from this server. Updates will now happen for each container separately." fi fi # Update selected images @@ -411,8 +411,8 @@ elif [ -f /tmp/prerelease.version ] then PRERELEASE_VERSION=yes msg_box "WARNING! You are about to update to a Beta/RC version of Nextcloud.\nThere's no turning back, \ -because it's not possible to downgrade.\n\nPlease only continue if you have made a backup, or took a snapshot." - if ! yesno_box_no "Do you really want to do this?" +as it's not currently possible to downgrade.\n\nPlease only continue if you have made a backup, or took a snapshot." + if ! yesno_box_no "Are you sure you would like to proceed?" then rm -f /tmp/prerelease.version unset PRERELEASE_VERSION @@ -441,9 +441,9 @@ Current version: $CURRENTVERSION Latest release: $NCVERSION It is best to keep your Nextcloud server upgraded regularly, and to install all point releases -and major releases without skipping any of them, as skipping releases increases the risk of -errors. Major releases are 16, 17, 18 and 19. Point releases are intermediate releases for each -major release. For example, 18.0.5 and 19.0.2 are point releases. +and major releases, as skipping releases increases the risk of errors. Major releases are +16, 17, 18 and 19. Point releases are intermediate releases for each major release. +For example, 18.0.5 and 19.0.2 are point releases. You can read more about Nextcloud releases here: https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule @@ -770,7 +770,7 @@ then ||| UPGRADE SUCCESS! ||| -If you notice that some apps are disabled it's due to that they are not compatible with the new Nextcloud version. +If you notice that some apps are disabled, it's because they are not compatible with the new Nextcloud version. To recover your old apps, please check $BACKUP/apps and copy them to $NCPATH/apps manually. Thank you for using T&M Hansson IT's updater!" @@ -791,7 +791,7 @@ else ||| UPGRADE FAILED! ||| -Your files are still backed up at $BACKUP. No worries! +No worries, your files are still backed up at $BACKUP! Please report this issue to $ISSUES Maintenance mode is kept on." diff --git a/not-supported/daily-backup-wizard.sh b/not-supported/daily-backup-wizard.sh index 67135c84..dff74325 100644 --- a/not-supported/daily-backup-wizard.sh +++ b/not-supported/daily-backup-wizard.sh @@ -277,7 +277,7 @@ fi while : do ENCRYPTION_KEY=$(input_box_flow "Please enter the encryption key that shall get used for Borg backups. -Please remember to store this key at a save place. You will not be able to restore your backup if you loose the key. +Please remember to store this key at a save place. You will not be able to restore your backup if you lose the key. If you want to cancel, just type in 'exit' and press [ENTER].") if [ "$ENCRYPTION_KEY" = "exit" ] then