This commit is contained in:
hwdsl2 2022-06-09 13:44:16 -05:00
parent b04fea3148
commit 0e24f8b086
12 changed files with 27 additions and 38 deletions

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 143 KiB

After

Width:  |  Height:  |  Size: 143 KiB

View File

@ -90,8 +90,7 @@ Password: $VPN_PASSWORD
Write these down. You'll need them to connect! Write these down. You'll need them to connect!
Important notes: vpnsetup.net/notes VPN client setup: https://vpnsetup.net/clients
VPN client setup: vpnsetup.net/clients
================================================ ================================================

View File

@ -104,7 +104,7 @@ check_ikev2() {
if ! grep -qs "conn ikev2-cp" /etc/ipsec.d/ikev2.conf; then if ! grep -qs "conn ikev2-cp" /etc/ipsec.d/ikev2.conf; then
cat 1>&2 <<'EOF' cat 1>&2 <<'EOF'
Error: You must first set up IKEv2 before changing IKEv2 server address. Error: You must first set up IKEv2 before changing IKEv2 server address.
See: vpnsetup.net/ikev2 See: https://vpnsetup.net/ikev2
EOF EOF
exit 1 exit 1
fi fi

View File

@ -59,7 +59,7 @@ EOF
if ! check_ikev2_exists; then if ! check_ikev2_exists; then
cat 1>&2 <<'EOF' cat 1>&2 <<'EOF'
Error: Your must first set up IKEv2 before selecting IKEv2-only mode. Error: Your must first set up IKEv2 before selecting IKEv2-only mode.
See: vpnsetup.net/ikev2 See: https://vpnsetup.net/ikev2
EOF EOF
exit 1 exit 1
fi fi

View File

@ -151,7 +151,7 @@ confirm_or_abort() {
show_header() { show_header() {
cat <<'EOF' cat <<'EOF'
IKEv2 Script Copyright (c) 2020-2022 Lin Song 7 Jun 2022 IKEv2 Script Copyright (c) 2020-2022 Lin Song 10 Jun 2022
EOF EOF
} }
@ -175,7 +175,7 @@ Options:
-h, --help show this help message and exit -h, --help show this help message and exit
To customize IKEv2 or client options, run this script without arguments. To customize IKEv2 or client options, run this script without arguments.
For documentation, see: vpnsetup.net/ikev2 For documentation, see: https://vpnsetup.net/ikev2
EOF EOF
exit 1 exit 1
} }
@ -1076,7 +1076,7 @@ create_config_readme() {
&& [ "$use_defaults" = "1" ] && [ ! -t 1 ] && [ ! -f "$readme_file" ]; then && [ "$use_defaults" = "1" ] && [ ! -t 1 ] && [ ! -f "$readme_file" ]; then
cat > "$readme_file" <<'EOF' cat > "$readme_file" <<'EOF'
These IKEv2 client config files were created during IPsec VPN setup. These IKEv2 client config files were created during IPsec VPN setup.
To configure IKEv2 clients, see: https://vpnsetup.net/ikev2 To configure IKEv2 clients, see: https://vpnsetup.net/clients
EOF EOF
if [ "$export_to_home_dir" = "1" ]; then if [ "$export_to_home_dir" = "1" ]; then
chown "$SUDO_USER:$SUDO_USER" "$readme_file" chown "$SUDO_USER:$SUDO_USER" "$readme_file"
@ -1271,7 +1271,7 @@ EOF
cat <<'EOF' cat <<'EOF'
Next steps: Configure IKEv2 clients. See: Next steps: Configure IKEv2 clients. See:
https://vpnsetup.net/ikev2 https://vpnsetup.net/clients
================================================ ================================================
@ -1299,7 +1299,7 @@ check_ipsec_conf() {
cat 1>&2 <<EOF cat 1>&2 <<EOF
Error: IKEv2 configuration section found in $IPSEC_CONF. Error: IKEv2 configuration section found in $IPSEC_CONF.
This script cannot automatically remove IKEv2 from this server. This script cannot automatically remove IKEv2 from this server.
To manually remove IKEv2, see vpnsetup.net/ikev2 To manually remove IKEv2, see https://vpnsetup.net/ikev2
EOF EOF
abort_and_exit abort_and_exit
fi fi

View File

@ -27,8 +27,7 @@ YOUR_IPSEC_PSK=''
YOUR_USERNAME='' YOUR_USERNAME=''
YOUR_PASSWORD='' YOUR_PASSWORD=''
# Important notes: vpnsetup.net/notes # VPN client setup: https://vpnsetup.net/clients
# VPN client setup: vpnsetup.net/clients
# ===================================================== # =====================================================

View File

@ -53,7 +53,8 @@ EOF
command -v openssl >/dev/null 2>&1 || exiterr "'openssl' not found. Abort." command -v openssl >/dev/null 2>&1 || exiterr "'openssl' not found. Abort."
if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
cat 1>&2 <<'EOF' cat 1>&2 <<'EOF'
For usage information, visit vpnsetup.net/notes, then click on Manage VPN Users. For usage information, visit https://github.com/hwdsl2/setup-ipsec-vpn,
then click on Manage VPN Users.
EOF EOF
exit 1 exit 1
fi fi
@ -107,8 +108,7 @@ cat <<'EOF'
Write these down. You'll need them to connect! Write these down. You'll need them to connect!
Important notes: vpnsetup.net/notes VPN client setup: https://vpnsetup.net/clients
VPN client setup: vpnsetup.net/clients
================================================== ==================================================

View File

@ -27,8 +27,7 @@ YOUR_IPSEC_PSK=''
YOUR_USERNAME='' YOUR_USERNAME=''
YOUR_PASSWORD='' YOUR_PASSWORD=''
# Important notes: vpnsetup.net/notes # VPN client setup: https://vpnsetup.net/clients
# VPN client setup: vpnsetup.net/clients
# ===================================================== # =====================================================

View File

@ -26,8 +26,7 @@ YOUR_IPSEC_PSK=''
YOUR_USERNAME='' YOUR_USERNAME=''
YOUR_PASSWORD='' YOUR_PASSWORD=''
# Important notes: vpnsetup.net/notes # VPN client setup: https://vpnsetup.net/clients
# VPN client setup: vpnsetup.net/clients
# ===================================================== # =====================================================
@ -529,8 +528,7 @@ Password: $VPN_PASSWORD
Write these down. You'll need them to connect! Write these down. You'll need them to connect!
Important notes: vpnsetup.net/notes VPN client setup: https://vpnsetup.net/clients
VPN client setup: vpnsetup.net/clients
================================================ ================================================
@ -553,7 +551,7 @@ cat <<'EOF'
IKEv2 is already set up on this server. IKEv2 is already set up on this server.
Next steps: Configure IKEv2 clients. See: Next steps: Configure IKEv2 clients. See:
https://vpnsetup.net/ikev2 https://vpnsetup.net/clients
To manage IKEv2 clients, run: sudo ikev2.sh To manage IKEv2 clients, run: sudo ikev2.sh

View File

@ -26,8 +26,7 @@ YOUR_IPSEC_PSK=''
YOUR_USERNAME='' YOUR_USERNAME=''
YOUR_PASSWORD='' YOUR_PASSWORD=''
# Important notes: vpnsetup.net/notes # VPN client setup: https://vpnsetup.net/clients
# VPN client setup: vpnsetup.net/clients
# ===================================================== # =====================================================
@ -545,8 +544,7 @@ Password: $VPN_PASSWORD
Write these down. You'll need them to connect! Write these down. You'll need them to connect!
Important notes: vpnsetup.net/notes VPN client setup: https://vpnsetup.net/clients
VPN client setup: vpnsetup.net/clients
================================================ ================================================
@ -569,7 +567,7 @@ cat <<'EOF'
IKEv2 is already set up on this server. IKEv2 is already set up on this server.
Next steps: Configure IKEv2 clients. See: Next steps: Configure IKEv2 clients. See:
https://vpnsetup.net/ikev2 https://vpnsetup.net/clients
To manage IKEv2 clients, run: sudo ikev2.sh To manage IKEv2 clients, run: sudo ikev2.sh

View File

@ -28,8 +28,7 @@ YOUR_IPSEC_PSK=''
YOUR_USERNAME='' YOUR_USERNAME=''
YOUR_PASSWORD='' YOUR_PASSWORD=''
# Important notes: vpnsetup.net/notes # VPN client setup: https://vpnsetup.net/clients
# VPN client setup: vpnsetup.net/clients
# ===================================================== # =====================================================
@ -685,8 +684,7 @@ Password: $VPN_PASSWORD
Write these down. You'll need them to connect! Write these down. You'll need them to connect!
Important notes: vpnsetup.net/notes VPN client setup: https://vpnsetup.net/clients
VPN client setup: vpnsetup.net/clients
================================================ ================================================
@ -709,7 +707,7 @@ cat <<'EOF'
IKEv2 is already set up on this server. IKEv2 is already set up on this server.
Next steps: Configure IKEv2 clients. See: Next steps: Configure IKEv2 clients. See:
https://vpnsetup.net/ikev2 https://vpnsetup.net/clients
To manage IKEv2 clients, run: sudo ikev2.sh To manage IKEv2 clients, run: sudo ikev2.sh

View File

@ -27,8 +27,7 @@ YOUR_IPSEC_PSK=''
YOUR_USERNAME='' YOUR_USERNAME=''
YOUR_PASSWORD='' YOUR_PASSWORD=''
# Important notes: vpnsetup.net/notes # VPN client setup: https://vpnsetup.net/clients
# VPN client setup: vpnsetup.net/clients
# ===================================================== # =====================================================
@ -647,8 +646,7 @@ Password: $VPN_PASSWORD
Write these down. You'll need them to connect! Write these down. You'll need them to connect!
Important notes: vpnsetup.net/notes VPN client setup: https://vpnsetup.net/clients
VPN client setup: vpnsetup.net/clients
================================================ ================================================
@ -657,7 +655,7 @@ EOF
cat <<'EOF' cat <<'EOF'
WARNING: /dev/ppp is missing, and IPsec/L2TP mode may not work. WARNING: /dev/ppp is missing, and IPsec/L2TP mode may not work.
Please use IKEv2 or IPsec/XAuth mode to connect. Please use IKEv2 or IPsec/XAuth mode to connect.
Debian 11/10 users, see vpnsetup.net/debian10 Debian 11/10 users, see https://vpnsetup.net/debian10
EOF EOF
fi fi
@ -679,7 +677,7 @@ cat <<'EOF'
IKEv2 is already set up on this server. IKEv2 is already set up on this server.
Next steps: Configure IKEv2 clients. See: Next steps: Configure IKEv2 clients. See:
https://vpnsetup.net/ikev2 https://vpnsetup.net/clients
To manage IKEv2 clients, run: sudo ikev2.sh To manage IKEv2 clients, run: sudo ikev2.sh