Cleanup
This commit is contained in:
parent
963a49d61a
commit
7b9813d562
File diff suppressed because one or more lines are too long
Before Width: | Height: | Size: 143 KiB After Width: | Height: | Size: 143 KiB |
@ -151,7 +151,7 @@ confirm_or_abort() {
|
|||||||
show_header() {
|
show_header() {
|
||||||
cat <<'EOF'
|
cat <<'EOF'
|
||||||
|
|
||||||
IKEv2 Script Copyright (c) 2020-2022 Lin Song 23 May 2022
|
IKEv2 Script Copyright (c) 2020-2022 Lin Song 27 May 2022
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
@ -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: vpnsetup.net/ikev2clients
|
To configure IKEv2 clients, see: https://vpnsetup.net/ikev2clients
|
||||||
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,27 +1271,13 @@ EOF
|
|||||||
cat <<'EOF'
|
cat <<'EOF'
|
||||||
|
|
||||||
Next steps: Configure IKEv2 clients. See:
|
Next steps: Configure IKEv2 clients. See:
|
||||||
vpnsetup.net/ikev2clients
|
https://vpnsetup.net/ikev2clients
|
||||||
|
|
||||||
================================================
|
================================================
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
show_optional_note() {
|
|
||||||
if [ "$os_type" = "ubuntu" ] || [ "$os_type" = "debian" ] \
|
|
||||||
|| { [ "$os_type" = "centos" ] && [ "$os_ver" = "7" ]; }; then
|
|
||||||
cat <<EOF
|
|
||||||
Note: You may optionally install OpenVPN and/or
|
|
||||||
WireGuard alongside IPsec VPN on this server.
|
|
||||||
Learn more at vpnsetup.net/ovpn vpnsetup.net/wg
|
|
||||||
|
|
||||||
================================================
|
|
||||||
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
check_swan_update() {
|
check_swan_update() {
|
||||||
base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0"
|
base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0"
|
||||||
swan_ver_url="$base_url/upg-$os_type-$os_ver-swanver"
|
swan_ver_url="$base_url/upg-$os_type-$os_ver-swanver"
|
||||||
@ -1625,7 +1611,6 @@ ikev2setup() {
|
|||||||
print_setup_complete
|
print_setup_complete
|
||||||
print_client_info
|
print_client_info
|
||||||
if [ "$in_container" = "0" ]; then
|
if [ "$in_container" = "0" ]; then
|
||||||
show_optional_note
|
|
||||||
check_swan_update
|
check_swan_update
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -555,7 +555,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:
|
||||||
vpnsetup.net/ikev2clients
|
https://vpnsetup.net/ikev2clients
|
||||||
|
|
||||||
To manage IKEv2 clients, run: sudo ikev2.sh
|
To manage IKEv2 clients, run: sudo ikev2.sh
|
||||||
|
|
||||||
|
@ -571,7 +571,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:
|
||||||
vpnsetup.net/ikev2clients
|
https://vpnsetup.net/ikev2clients
|
||||||
|
|
||||||
To manage IKEv2 clients, run: sudo ikev2.sh
|
To manage IKEv2 clients, run: sudo ikev2.sh
|
||||||
|
|
||||||
|
@ -709,7 +709,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:
|
||||||
vpnsetup.net/ikev2clients
|
https://vpnsetup.net/ikev2clients
|
||||||
|
|
||||||
To manage IKEv2 clients, run: sudo ikev2.sh
|
To manage IKEv2 clients, run: sudo ikev2.sh
|
||||||
|
|
||||||
|
@ -681,7 +681,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:
|
||||||
vpnsetup.net/ikev2clients
|
https://vpnsetup.net/ikev2clients
|
||||||
|
|
||||||
To manage IKEv2 clients, run: sudo ikev2.sh
|
To manage IKEv2 clients, run: sudo ikev2.sh
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user