Signed-off-by: szaimen <szaimen@e.mail.de>
This commit is contained in:
szaimen 2021-03-12 14:51:07 +01:00 коммит произвёл GitHub
Родитель 1ae4135f7c
Коммит 9a1134e425
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
21 изменённых файлов: 32 добавлений и 32 удалений

Просмотреть файл

@ -28,7 +28,7 @@ $MENU_GUIDE\n\n$RUN_LATER_GUIDE" "$WT_HEIGHT" "$WT_WIDTH" 4 \
"172800s" "2 days" \
"604800s" "1 week" \
"2419200s" "4 weeks" \
"Custom" "setup a custom time" 3>&1 1>&2 2>&3)
"Custom" "set up a custom time" 3>&1 1>&2 2>&3)
case "$choice" in
"1800s")

Просмотреть файл

@ -42,7 +42,7 @@ 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 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.
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 set up your domain at the deSEC website.
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.
@ -80,8 +80,8 @@ do
exit
fi
else
msg_box "$DEDYNDOMAIN was successfully set up with deSEC! Now please continue with the DDNS and TLS setup for the domain."
break
msg_box "$DEDYNDOMAIN was successfully setup with deSEC! Now please continue with the DDNS and TLS setup for the domain."
fi
done

Просмотреть файл

@ -4,7 +4,7 @@
# shellcheck disable=SC2154
true
SCRIPT_NAME="Setup Extra Security"
SCRIPT_NAME="Set up Extra Security"
# shellcheck source=lib.sh
source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)

Просмотреть файл

@ -6,7 +6,7 @@ true
SCRIPT_NAME="ClamAV"
SCRIPT_EXPLAINER="This script installs the open-source antivirus-software ClamAV on your server \
and configures Nextcloud to detect infected files already during the upload.
At the end of the script, you will be able to choose to setup a weekly full scan of all files."
At the end of the script, you will be able to choose to set up a weekly full scan of all files."
# shellcheck source=lib.sh
source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
@ -194,7 +194,7 @@ msg_box "ClamAV was successfully installed.
Your Nextcloud should be more secure now."
# Ask for full-scan
if ! yesno_box_yes "Do you want to setup a weekly full scan of all your files?
if ! yesno_box_yes "Do you want to set up a weekly full scan of all your files?
It will run on Sundays starting at 10:00 and will continue for a maximum of 12 hours (hardcoded).
You will be notified when it's finished so that you can check the final result."
then

Просмотреть файл

@ -292,7 +292,7 @@ The Share has been mounted to the Nextcloud admin-group if not specifically chan
You can now access 'https://yourdomain-or-ipaddress/settings/admin/externalstorages' \
to edit external storages in Nextcloud."
# Inform the user that he can setup inotify for this external storage
# Inform the user that he can set up inotify for this external storage
if ! yesno_box_no "Do you want to enable inotify for this external storage in Nextcloud?
It is only recommended if the content can get changed externally and \
will let Nextcloud track if this external storage was externally changed.
@ -353,7 +353,7 @@ We please you to do the math yourself if the number is high enough for your setu
if ! yesno_box_yes "The inotify PHP extension was successfully installed, \
the max folder variable was set to 524288 and $VMLOGS/files_inotify.log was created.
Just press [ENTER] (on the default 'yes') to install the needed \
files_inotify app and setup the cronjob for this external storage."
files_inotify app and set up the cronjob for this external storage."
then
break
fi

Просмотреть файл

@ -194,7 +194,7 @@ countdown "Waiting for the DB to come online..." 5
check_command sudo -u "$BITWARDEN_USER" ./bitwarden.sh updatedb
# Produce reverse-proxy config and get lets-encrypt certificate
msg_box "We'll now setup the Apache Proxy that will act as TLS front for your Bitwarden installation."
msg_box "We'll now set up the Apache Proxy that will act as TLS front for your Bitwarden installation."
msg_box "Before continuing, please make sure that you have you have \
edited the DNS settings for $SUBDOMAIN, and opened port 80 and 443 \
@ -362,7 +362,7 @@ fi
# Add prune command
add_dockerprune
msg_box "Bitwarden was successfully installed! Please visit $SUBDOMAIN to setup your account.
msg_box "Bitwarden was successfully installed! Please visit $SUBDOMAIN to set up your account.
After the account is registered, please disable user registration by running sudo bash $SCRIPTS/menu.sh and choose:
Additional Apps --> Bitwarden --> Bitwarden Registration

Просмотреть файл

@ -5,7 +5,7 @@
true
SCRIPT_NAME="Webmin"
SCRIPT_EXPLAINER="Webmin is a web-based interface for system administration for Unix.
Using any modern web browser, you can setup user accounts, Apache, DNS, file sharing and much more.
Using any modern web browser, you can set up user accounts, Apache, DNS, file sharing and much more.
Webmin removes the need to manually edit Unix configuration files like /etc/passwd, \
and lets you manage a system from the console or remotely.
See the following page with standard modules for a list of all the functions built into Webmin: \

2
lib.sh
Просмотреть файл

@ -471,7 +471,7 @@ 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 other edge cases.
If you feel brave, or are sure that everything is setup correctly, \
If you feel brave, or are sure that everything is set up correctly, \
then you can choose to skip this test in the next step.
If needed, you can always contact us for further support: \

Просмотреть файл

@ -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 setup a dedyn.io domain, together with DDNS and TLS)" "$STARTUP_SWITCH" \
"deSEC" "(Automatically set up 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 \

Просмотреть файл

@ -48,7 +48,7 @@ fi
if [ -f "$SCRIPTS/nextcloud-startup-script.sh" ]
then
msg_box "Running a server, it's important that certain things are correct.
In the following menu you will be asked to setup the most basic stuff of your server.
In the following menu you will be asked to set up the most basic stuff of your server.
The script is smart, and have already pre-selected the values that you'd want to change based on the current settings."
fi

Просмотреть файл

@ -5,7 +5,7 @@
true
SCRIPT_NAME="DynDNS with ddclient"
SCRIPT_EXPLAINER="This script lets you setup DynDNS by using the Linux ddclient software."
SCRIPT_EXPLAINER="This script lets you set up DynDNS by using the Linux ddclient software."
# shellcheck source=lib.sh
source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
@ -56,7 +56,7 @@ then
choice="deSEC"
else
choice=$(whiptail --title "$TITLE" --menu \
"Please choose your DynDNS-Provider.\nYou have to setup an account before you can start.\n
"Please choose your DynDNS-Provider.\nYou have to set up an account before you can start.\n
If your DDNS provider isn't already supported, please open a new issue here:\n$ISSUES
$MENU_GUIDE\n\n$RUN_LATER_GUIDE" "$WT_HEIGHT" "$WT_WIDTH" 4 \
"Cloudflare" "(cloudflare.com)" \

Просмотреть файл

@ -424,8 +424,8 @@ There are still a few steps left but they are automated so sit back and relax! :
# Add default notifications
notify_admin_gui \
"Please setup SMTP" \
"Please remember to setup SMTP to be able to send shared links, user notifications and more via email. \
"Please set up SMTP" \
"Please remember to set up SMTP to be able to send shared links, user notifications and more via email. \
Please go here and start setting it up: https://your-nextcloud/settings/admin."
notify_admin_gui \

Просмотреть файл

@ -32,7 +32,7 @@ fi
# Check if restore is possible
if ! [ -f "$DAILY_BACKUP_FILE" ]
then
msg_box "It seems like you haven't setup daily borg backups.
msg_box "It seems like you haven't set up daily borg backups.
Please do that before you can view backups."
exit 1
fi

Просмотреть файл

@ -50,7 +50,7 @@ fi
if does_snapshot_exist "NcVM-snapshot-pending"
then
msg_box "It seems to be currently running a backup or update.
Cannot setup the daily backup now. Please try again later."
Cannot set up the daily backup now. Please try again later."
exit 1
elif does_snapshot_exist "NcVM-startup"
then

Просмотреть файл

@ -58,7 +58,7 @@ fi
if does_snapshot_exist "NcVM-snapshot-pending"
then
msg_box "It seems to be currently running a backup or update.
Cannot setup the off-shore backup now. Please try again later."
Cannot set up the off-shore backup now. Please try again later."
exit 1
elif does_snapshot_exist "NcVM-startup"
then

Просмотреть файл

@ -232,7 +232,7 @@ Please report this to $ISSUES"
exit 1
fi
# Setup REV_SERVER for local DNS entries because Pi-hole isn't the DHCP server and some other settings
# Set up REV_SERVER for local DNS entries because Pi-hole isn't the DHCP server and some other settings
if [ -f /etc/pihole/setupVars.conf ] && ! grep -q "REV_SERVER" /etc/pihole/setupVars.conf
then
cat << PIHOLE_CONF >> /etc/pihole/setupVars.conf
@ -363,8 +363,8 @@ ufw allow 53/tcp comment 'Pi-hole TCP' &>/dev/null
ufw allow 53/udp comment 'Pi-hole UDP' &>/dev/null
ufw allow 8094/tcp comment 'Pi-hole Web' &>/dev/null
# Show that everything was setup correctly
msg_box "Congratulations, your Pi-hole was setup correctly!
# Show that everything was set up correctly
msg_box "Congratulations, your Pi-hole was set up correctly!
It is now reachable on:
https://$ADDRESS:8094/admin
@ -446,7 +446,7 @@ then
Please report this to $ISSUES"
fi
# Setup Pi-hole
# Set up Pi-hole
sed -i 's|^PIHOLE_DNS_1=.*|PIHOLE_DNS_1=127.0.0.1#5335|' /etc/pihole/setupVars.conf
sed -i '/^PIHOLE_DNS_2=.*/d' /etc/pihole/setupVars.conf

Просмотреть файл

@ -6,7 +6,7 @@
true
SCRIPT_NAME="PiVPN"
SCRIPT_EXPLAINER="PiVPN is one of the fastest and most user friendly ways to get a running Wireguard VPN server.
This script will setup a Wireguard VPN server to connect devices to your home net from everywhere.
This script will set up a Wireguard VPN server to connect devices to your home net from everywhere.
Wireguard is a relatively new VPN protocol, that is much faster and better then e.g. OpenVPN."
# shellcheck source=lib.sh
source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
@ -238,7 +238,7 @@ fi
ufw allow 51820/udp comment 'PiVPN' &>/dev/null
# Inform the user about successfully installing PiVPN
msg_box "Congratulations, your PiVPN was setup correctly!
msg_box "Congratulations, your PiVPN was set up correctly!
You can now generate new client profiles for your devices by running:
'pivpn -a'

Просмотреть файл

@ -157,7 +157,7 @@ You will have the option to automatically open this port by using UPNP in the ne
check_open_port 32400 "$WANIP4"
fi
msg_box "You should visit 'http://$ADDRESS:32400/web' to setup your PLEX Media Server next.
msg_box "You should visit 'http://$ADDRESS:32400/web' to set up your PLEX Media Server next.
Advice: All your drives should be mounted in a subfolder of '/mnt'"
exit

Просмотреть файл

@ -864,7 +864,7 @@ The Share has been mounted to the Nextcloud admin-group if not specifically chan
You can now access 'https://yourdomain-or-ipaddress/settings/admin/externalstorages' \
to edit external storages in Nextcloud." "$SUBTITLE"
# Inform the user that he can setup inotify for this external storage
# Inform the user that he can set up inotify for this external storage
if ! yesno_box_no "Do you want to enable inotify for this external storage in Nextcloud?
It is only recommended if the content can get changed externally and \
will let Nextcloud track if this external storage was externally changed.
@ -925,7 +925,7 @@ We please you to do the math yourself if the number is high enough for your setu
if ! yesno_box_yes "The inotify PHP extension was successfully installed, \
the max folder variable was set to 524288 and $VMLOGS/files_inotify.log was created.
Just press [ENTER] (on the default 'yes') to install the needed \
files_inotify app and setup the cronjob for this external storage."
files_inotify app and set up the cronjob for this external storage."
then
return
fi

Просмотреть файл

@ -59,7 +59,7 @@ fi
# Check if restore is possible
if ! [ -f "$DAILY_BACKUP_FILE" ]
then
msg_box "It seems like you haven't setup daily borg backups.
msg_box "It seems like you haven't set up daily borg backups.
Please do that before you can view backups."
exit 1
fi

Просмотреть файл

@ -3,7 +3,7 @@
# T&M Hansson IT AB © - 2021, https://www.hanssonit.se/
true
SCRIPT_NAME="Setup Secure Permissions for Nextcloud"
SCRIPT_NAME="Set up Secure Permissions for Nextcloud"
# shellcheck source=lib.sh
source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)