1
0
mirror of synced 2024-11-23 21:36:09 +03:00

Compare commits

..

No commits in common. "7ce3c29e15f424f1112f5255d15d03ce34da71de" and "c15d2759c445890c2278b7cb905ae8593b5eb8b5" have entirely different histories.

15 changed files with 45 additions and 59 deletions

View File

@ -34,7 +34,6 @@ jobs:
gh="https://github.com/hwdsl2/setup-ipsec-vpn/raw/master" gh="https://github.com/hwdsl2/setup-ipsec-vpn/raw/master"
gl="https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master" gl="https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master"
gi="https://git.io" gi="https://git.io"
vn="https://get.vpnsetup.net"
$wg vpnsetup.sh "$gi/vpnsetup" $wg vpnsetup.sh "$gi/vpnsetup"
$wg vpnsetup_centos.sh "$gi/vpnsetup-centos" $wg vpnsetup_centos.sh "$gi/vpnsetup-centos"
@ -53,17 +52,13 @@ jobs:
$wg vpnsetup2.sh "$gh/vpnsetup.sh" $wg vpnsetup2.sh "$gh/vpnsetup.sh"
$wg vpnsetup3.sh "$gl/vpnsetup.sh" $wg vpnsetup3.sh "$gl/vpnsetup.sh"
$wg vpnsetup4.sh "$vn"
$wg vpnsetup_centos2.sh "$gh/vpnsetup_centos.sh" $wg vpnsetup_centos2.sh "$gh/vpnsetup_centos.sh"
$wg vpnsetup_amzn2.sh "$gh/vpnsetup_amzn.sh" $wg vpnsetup_amzn2.sh "$gh/vpnsetup_amzn.sh"
$wg vpnsetup_ubuntu2.sh "$gh/vpnsetup_ubuntu.sh" $wg vpnsetup_ubuntu2.sh "$gh/vpnsetup_ubuntu.sh"
$wg vpnsetup_alpine2.sh "$gh/vpnsetup_alpine.sh" $wg vpnsetup_alpine2.sh "$gh/vpnsetup_alpine.sh"
$wg quickstart2.sh "$gh/extras/quickstart.sh" $wg quickstart2.sh "$gh/extras/quickstart.sh"
$wg ikev2setup2.sh "$gh/extras/ikev2setup.sh" $wg ikev2setup2.sh "$gh/extras/ikev2setup.sh"
$wg ikev2setup3.sh "$vn/ikev2"
$wg vpnupgrade2.sh "$gh/extras/vpnupgrade.sh" $wg vpnupgrade2.sh "$gh/extras/vpnupgrade.sh"
$wg vpnupgrade3.sh "$gl/extras/vpnupgrade.sh"
$wg vpnupgrade4.sh "$vn/upg"
$wg vpnupgrade_centos2.sh "$gh/extras/vpnupgrade_centos.sh" $wg vpnupgrade_centos2.sh "$gh/extras/vpnupgrade_centos.sh"
$wg vpnupgrade_amzn2.sh "$gh/extras/vpnupgrade_amzn.sh" $wg vpnupgrade_amzn2.sh "$gh/extras/vpnupgrade_amzn.sh"
$wg vpnupgrade_ubuntu2.sh "$gh/extras/vpnupgrade_ubuntu.sh" $wg vpnupgrade_ubuntu2.sh "$gh/extras/vpnupgrade_ubuntu.sh"
@ -87,17 +82,13 @@ jobs:
diff vpnsetup2.sh ../vpnsetup.sh diff vpnsetup2.sh ../vpnsetup.sh
diff vpnsetup3.sh ../vpnsetup.sh diff vpnsetup3.sh ../vpnsetup.sh
diff vpnsetup4.sh ../vpnsetup.sh
diff vpnsetup_centos2.sh ../vpnsetup_centos.sh diff vpnsetup_centos2.sh ../vpnsetup_centos.sh
diff vpnsetup_amzn2.sh ../vpnsetup_amzn.sh diff vpnsetup_amzn2.sh ../vpnsetup_amzn.sh
diff vpnsetup_ubuntu2.sh ../vpnsetup_ubuntu.sh diff vpnsetup_ubuntu2.sh ../vpnsetup_ubuntu.sh
diff vpnsetup_alpine2.sh ../vpnsetup_alpine.sh diff vpnsetup_alpine2.sh ../vpnsetup_alpine.sh
diff quickstart2.sh ../extras/quickstart.sh diff quickstart2.sh ../extras/quickstart.sh
diff ikev2setup2.sh ../extras/ikev2setup.sh diff ikev2setup2.sh ../extras/ikev2setup.sh
diff ikev2setup3.sh ../extras/ikev2setup.sh
diff vpnupgrade2.sh ../extras/vpnupgrade.sh diff vpnupgrade2.sh ../extras/vpnupgrade.sh
diff vpnupgrade3.sh ../extras/vpnupgrade.sh
diff vpnupgrade4.sh ../extras/vpnupgrade.sh
diff vpnupgrade_centos2.sh ../extras/vpnupgrade_centos.sh diff vpnupgrade_centos2.sh ../extras/vpnupgrade_centos.sh
diff vpnupgrade_amzn2.sh ../extras/vpnupgrade_amzn.sh diff vpnupgrade_amzn2.sh ../extras/vpnupgrade_amzn.sh
diff vpnupgrade_ubuntu2.sh ../extras/vpnupgrade_ubuntu.sh diff vpnupgrade_ubuntu2.sh ../extras/vpnupgrade_ubuntu.sh
@ -120,4 +111,3 @@ jobs:
curl -fsSI "$bl/updatevpnusers" | grep -q 'update_vpn_users.sh' curl -fsSI "$bl/updatevpnusers" | grep -q 'update_vpn_users.sh'
curl -fsSI "$bl/ikev2onlymode" | grep -q 'ikev2onlymode.sh' curl -fsSI "$bl/ikev2onlymode" | grep -q 'ikev2onlymode.sh'
curl -fsSI "$bl/ikev2changeaddr" | grep -q 'ikev2changeaddr.sh' curl -fsSI "$bl/ikev2changeaddr" | grep -q 'ikev2changeaddr.sh'
curl -fsSI "$bl/vpnuninstall" | grep -q 'vpnuninstall.sh'

View File

@ -233,8 +233,6 @@ wget https://get.vpnsetup.net/upg -qO vpnup.sh && sudo sh vpnup.sh
或者,你也可以使用以下命令。 或者,你也可以使用以下命令。
</summary> </summary>
或者,你也可以使用这个链接:
```bash ```bash
wget https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master/extras/vpnupgrade.sh -qO vpnup.sh && sudo sh vpnup.sh wget https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master/extras/vpnupgrade.sh -qO vpnup.sh && sudo sh vpnup.sh
``` ```

View File

@ -233,8 +233,6 @@ wget https://get.vpnsetup.net/upg -qO vpnup.sh && sudo sh vpnup.sh
Alternative one-liner. Alternative one-liner.
</summary> </summary>
Alternative update URL:
```bash ```bash
wget https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master/extras/vpnupgrade.sh -qO vpnup.sh && sudo sh vpnup.sh wget https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master/extras/vpnupgrade.sh -qO vpnup.sh && sudo sh vpnup.sh
``` ```

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,8 @@ 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 Important notes: https://git.io/vpnnotes
Setup VPN clients: vpnsetup.net/clients Setup VPN clients: https://git.io/vpnclients
================================================ ================================================

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://git.io/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://git.io/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 30 Apr 2022 IKEv2 Script Copyright (c) 2020-2022 Lin Song 28 Apr 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://git.io/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: vpnsetup.net/ikev2clients To configure IKEv2 clients, see: https://git.io/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,7 +1271,7 @@ EOF
cat <<'EOF' cat <<'EOF'
Next steps: Configure IKEv2 clients. See: Next steps: Configure IKEv2 clients. See:
vpnsetup.net/ikev2clients https://git.io/ikev2clients
================================================ ================================================
@ -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://git.io/ikev2
EOF EOF
abort_and_exit abort_and_exit
fi fi

View File

@ -27,9 +27,9 @@ YOUR_IPSEC_PSK=''
YOUR_USERNAME='' YOUR_USERNAME=''
YOUR_PASSWORD='' YOUR_PASSWORD=''
# Important notes: vpnsetup.net/notes # Important notes: https://git.io/vpnnotes
# Setup VPN clients: vpnsetup.net/clients # Setup VPN clients: https://git.io/vpnclients
# IKEv2 guide: vpnsetup.net/ikev2 # IKEv2 guide: https://git.io/ikev2
# ===================================================== # =====================================================

View File

@ -53,7 +53,7 @@ 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://git.io/vpnnotes, then click on Manage VPN Users.
EOF EOF
exit 1 exit 1
fi fi
@ -107,8 +107,8 @@ 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 Important notes: https://git.io/vpnnotes
Setup VPN clients: vpnsetup.net/clients Setup VPN clients: https://git.io/vpnclients
================================================== ==================================================

View File

@ -27,9 +27,9 @@ YOUR_IPSEC_PSK=''
YOUR_USERNAME='' YOUR_USERNAME=''
YOUR_PASSWORD='' YOUR_PASSWORD=''
# Important notes: vpnsetup.net/notes # Important notes: https://git.io/vpnnotes
# Setup VPN clients: vpnsetup.net/clients # Setup VPN clients: https://git.io/vpnclients
# IKEv2 guide: vpnsetup.net/ikev2 # IKEv2 guide: https://git.io/ikev2
# ===================================================== # =====================================================

View File

@ -26,9 +26,9 @@ YOUR_IPSEC_PSK=''
YOUR_USERNAME='' YOUR_USERNAME=''
YOUR_PASSWORD='' YOUR_PASSWORD=''
# Important notes: vpnsetup.net/notes # Important notes: https://git.io/vpnnotes
# Setup VPN clients: vpnsetup.net/clients # Setup VPN clients: https://git.io/vpnclients
# IKEv2 guide: vpnsetup.net/ikev2 # IKEv2 guide: https://git.io/ikev2
# ===================================================== # =====================================================
@ -517,9 +517,9 @@ 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 Important notes: https://git.io/vpnnotes
Setup VPN clients: vpnsetup.net/clients Setup VPN clients: https://git.io/vpnclients
IKEv2 guide: vpnsetup.net/ikev2 IKEv2 guide: https://git.io/ikev2
================================================ ================================================

View File

@ -26,9 +26,9 @@ YOUR_IPSEC_PSK=''
YOUR_USERNAME='' YOUR_USERNAME=''
YOUR_PASSWORD='' YOUR_PASSWORD=''
# Important notes: vpnsetup.net/notes # Important notes: https://git.io/vpnnotes
# Setup VPN clients: vpnsetup.net/clients # Setup VPN clients: https://git.io/vpnclients
# IKEv2 guide: vpnsetup.net/ikev2 # IKEv2 guide: https://git.io/ikev2
# ===================================================== # =====================================================
@ -533,9 +533,9 @@ 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 Important notes: https://git.io/vpnnotes
Setup VPN clients: vpnsetup.net/clients Setup VPN clients: https://git.io/vpnclients
IKEv2 guide: vpnsetup.net/ikev2 IKEv2 guide: https://git.io/ikev2
================================================ ================================================

View File

@ -28,9 +28,9 @@ YOUR_IPSEC_PSK=''
YOUR_USERNAME='' YOUR_USERNAME=''
YOUR_PASSWORD='' YOUR_PASSWORD=''
# Important notes: vpnsetup.net/notes # Important notes: https://git.io/vpnnotes
# Setup VPN clients: vpnsetup.net/clients # Setup VPN clients: https://git.io/vpnclients
# IKEv2 guide: vpnsetup.net/ikev2 # IKEv2 guide: https://git.io/ikev2
# ===================================================== # =====================================================
@ -660,9 +660,9 @@ 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 Important notes: https://git.io/vpnnotes
Setup VPN clients: vpnsetup.net/clients Setup VPN clients: https://git.io/vpnclients
IKEv2 guide: vpnsetup.net/ikev2 IKEv2 guide: https://git.io/ikev2
================================================ ================================================

View File

@ -27,9 +27,9 @@ YOUR_IPSEC_PSK=''
YOUR_USERNAME='' YOUR_USERNAME=''
YOUR_PASSWORD='' YOUR_PASSWORD=''
# Important notes: vpnsetup.net/notes # Important notes: https://git.io/vpnnotes
# Setup VPN clients: vpnsetup.net/clients # Setup VPN clients: https://git.io/vpnclients
# IKEv2 guide: vpnsetup.net/ikev2 # IKEv2 guide: https://git.io/ikev2
# ===================================================== # =====================================================
@ -624,9 +624,9 @@ 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 Important notes: https://git.io/vpnnotes
Setup VPN clients: vpnsetup.net/clients Setup VPN clients: https://git.io/vpnclients
IKEv2 guide: vpnsetup.net/ikev2 IKEv2 guide: https://git.io/ikev2
================================================ ================================================
@ -634,8 +634,8 @@ EOF
if [ ! -e /dev/ppp ]; then if [ ! -e /dev/ppp ]; then
cat <<'EOF' cat <<'EOF'
Warning: /dev/ppp is missing, and IPsec/L2TP mode may not work. Please use Warning: /dev/ppp is missing, and IPsec/L2TP mode may not work. Please use
IKEv2 (vpnsetup.net/ikev2) or IPsec/XAuth mode to connect. IKEv2 (https://git.io/ikev2) or IPsec/XAuth mode to connect.
Debian 11/10 users, see vpnsetup.net/debian10 Debian 11/10 users, see https://git.io/vpndebian10
EOF EOF
fi fi