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

Compare commits

..

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

11 changed files with 28 additions and 50 deletions

View File

@ -31,9 +31,9 @@ jobs:
sudo apt-get -yqq install wget curl sudo apt-get -yqq install wget curl
wg="wget -t 3 -T 30 -nv -O" wg="wget -t 3 -T 30 -nv -O"
gi="https://git.io"
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"
vn="https://get.vpnsetup.net" vn="https://get.vpnsetup.net"
$wg vpnsetup.sh "$gi/vpnsetup" $wg vpnsetup.sh "$gi/vpnsetup"
@ -62,20 +62,14 @@ jobs:
$wg ikev2setup2.sh "$gh/extras/ikev2setup.sh" $wg ikev2setup2.sh "$gh/extras/ikev2setup.sh"
$wg ikev2setup3.sh "$vn/ikev2" $wg ikev2setup3.sh "$vn/ikev2"
$wg vpnupgrade2.sh "$gh/extras/vpnupgrade.sh" $wg vpnupgrade2.sh "$gh/extras/vpnupgrade.sh"
$wg vpnupgrade3.sh "$vn/upg" $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"
$wg vpnupgrade_alpine2.sh "$gh/extras/vpnupgrade_alpine.sh" $wg vpnupgrade_alpine2.sh "$gh/extras/vpnupgrade_alpine.sh"
$wg vpnuninstall2.sh "$gh/extras/vpnuninstall.sh" $wg vpnuninstall2.sh "$gh/extras/vpnuninstall.sh"
$wg vpnuninstall.sh "$vn/unst"
$wg ikev2onlymode.sh "$vn/ikev2only"
$wg ikev2changeaddr.sh "$vn/ikev2addr"
$wg add_vpn_user.sh "$vn/adduser"
$wg del_vpn_user.sh "$vn/deluser"
$wg update_vpn_users.sh "$vn/updateusers"
diff vpnsetup.sh ../vpnsetup.sh diff vpnsetup.sh ../vpnsetup.sh
diff vpnsetup_centos.sh ../vpnsetup_centos.sh diff vpnsetup_centos.sh ../vpnsetup_centos.sh
diff vpnsetup_amzn.sh ../vpnsetup_amzn.sh diff vpnsetup_amzn.sh ../vpnsetup_amzn.sh
@ -103,19 +97,13 @@ jobs:
diff ikev2setup3.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 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
diff vpnupgrade_alpine2.sh ../extras/vpnupgrade_alpine.sh diff vpnupgrade_alpine2.sh ../extras/vpnupgrade_alpine.sh
diff vpnuninstall2.sh ../extras/vpnuninstall.sh diff vpnuninstall2.sh ../extras/vpnuninstall.sh
diff vpnuninstall.sh ../extras/vpnuninstall.sh
diff ikev2onlymode.sh ../extras/ikev2onlymode.sh
diff ikev2changeaddr.sh ../extras/ikev2changeaddr.sh
diff add_vpn_user.sh ../extras/add_vpn_user.sh
diff del_vpn_user.sh ../extras/del_vpn_user.sh
diff update_vpn_users.sh ../extras/update_vpn_users.sh
url1="https://mirrors.kernel.org/ubuntu/pool/main/n/nss" url1="https://mirrors.kernel.org/ubuntu/pool/main/n/nss"
url2="https://mirrors.kernel.org/ubuntu/pool/universe/n/nss" url2="https://mirrors.kernel.org/ubuntu/pool/universe/n/nss"
deb1="libnss3_3.49.1-1ubuntu1.6_amd64.deb" deb1="libnss3_3.49.1-1ubuntu1.6_amd64.deb"
@ -125,3 +113,11 @@ jobs:
$wg 1.deb "$url1/$deb1" $wg 1.deb "$url1/$deb1"
$wg 2.deb "$url1/$deb2" $wg 2.deb "$url1/$deb2"
$wg 3.deb "$url2/$deb3" $wg 3.deb "$url2/$deb3"
bl="https://bit.ly"
curl -fsSI "$bl/addvpnuser" | grep -q 'add_vpn_user.sh'
curl -fsSI "$bl/delvpnuser" | grep -q 'del_vpn_user.sh'
curl -fsSI "$bl/updatevpnusers" | grep -q 'update_vpn_users.sh'
curl -fsSI "$bl/ikev2onlymode" | grep -q 'ikev2onlymode.sh'
curl -fsSI "$bl/ikev2changeaddr" | grep -q 'ikev2changeaddr.sh'
curl -fsSI "$bl/vpnuninstall" | grep -q 'vpnuninstall.sh'

View File

@ -233,6 +233,8 @@ 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,6 +233,8 @@ 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
``` ```

View File

@ -44,7 +44,7 @@ sudo VPN_DNS_NAME='vpn.example.com' ikev2.sh --auto
```bash ```bash
# 下载脚本 # 下载脚本
wget -nv -O ikev2onlymode.sh https://get.vpnsetup.net/ikev2only wget -nv -O ikev2onlymode.sh https://bit.ly/ikev2onlymode
# 运行脚本并按提示操作 # 运行脚本并按提示操作
sudo bash ikev2onlymode.sh sudo bash ikev2onlymode.sh
``` ```

View File

@ -44,7 +44,7 @@ To enable IKEv2-only mode, first install the VPN server and set up IKEv2 using i
```bash ```bash
# Download the script # Download the script
wget -nv -O ikev2onlymode.sh https://get.vpnsetup.net/ikev2only wget -nv -O ikev2onlymode.sh https://bit.ly/ikev2onlymode
# Run the script and follow the prompts # Run the script and follow the prompts
sudo bash ikev2onlymode.sh sudo bash ikev2onlymode.sh
``` ```

View File

@ -764,7 +764,7 @@ REG ADD HKLM\SYSTEM\CurrentControlSet\Services\RasMan\Parameters /v NegotiateDH2
```bash ```bash
# 下载脚本 # 下载脚本
wget -nv -O ikev2changeaddr.sh https://get.vpnsetup.net/ikev2addr wget -nv -O ikev2changeaddr.sh https://bit.ly/ikev2changeaddr
# 运行脚本并按照提示操作 # 运行脚本并按照提示操作
sudo bash ikev2changeaddr.sh sudo bash ikev2changeaddr.sh
``` ```

View File

@ -766,7 +766,7 @@ To change the server address, run this [helper script](../extras/ikev2changeaddr
```bash ```bash
# Download the script # Download the script
wget -nv -O ikev2changeaddr.sh https://get.vpnsetup.net/ikev2addr wget -nv -O ikev2changeaddr.sh https://bit.ly/ikev2changeaddr
# Run the script and follow the prompts # Run the script and follow the prompts
sudo bash ikev2changeaddr.sh sudo bash ikev2changeaddr.sh
``` ```

View File

@ -35,7 +35,7 @@ sudo addvpnuser.sh
如果你使用了较早版本的 VPN 安装脚本,这是正常的。首先下载辅助脚本: 如果你使用了较早版本的 VPN 安装脚本,这是正常的。首先下载辅助脚本:
```bash ```bash
wget -nv -O /opt/src/addvpnuser.sh https://get.vpnsetup.net/adduser wget -nv -O /opt/src/addvpnuser.sh https://bit.ly/addvpnuser
chmod +x /opt/src/addvpnuser.sh && ln -s /opt/src/addvpnuser.sh /usr/bin chmod +x /opt/src/addvpnuser.sh && ln -s /opt/src/addvpnuser.sh /usr/bin
``` ```
@ -70,7 +70,7 @@ sudo delvpnuser.sh
如果你使用了较早版本的 VPN 安装脚本,这是正常的。首先下载辅助脚本: 如果你使用了较早版本的 VPN 安装脚本,这是正常的。首先下载辅助脚本:
```bash ```bash
wget -nv -O /opt/src/delvpnuser.sh https://get.vpnsetup.net/deluser wget -nv -O /opt/src/delvpnuser.sh https://bit.ly/delvpnuser
chmod +x /opt/src/delvpnuser.sh && ln -s /opt/src/delvpnuser.sh /usr/bin chmod +x /opt/src/delvpnuser.sh && ln -s /opt/src/delvpnuser.sh /usr/bin
``` ```
@ -92,7 +92,7 @@ sudo delvpnuser.sh '要删除的用户名'
首先下载脚本: 首先下载脚本:
```bash ```bash
wget -nv -O updatevpnusers.sh https://get.vpnsetup.net/updateusers wget -nv -O updatevpnusers.sh https://bit.ly/updatevpnusers
``` ```
要使用这个脚本,从以下选项中选择一个: 要使用这个脚本,从以下选项中选择一个:

View File

@ -35,7 +35,7 @@ Error: "sudo: addvpnuser.sh: command not found".
This is normal if you used an older version of the VPN setup script. First, download the helper script: This is normal if you used an older version of the VPN setup script. First, download the helper script:
```bash ```bash
wget -nv -O /opt/src/addvpnuser.sh https://get.vpnsetup.net/adduser wget -nv -O /opt/src/addvpnuser.sh https://bit.ly/addvpnuser
chmod +x /opt/src/addvpnuser.sh && ln -s /opt/src/addvpnuser.sh /usr/bin chmod +x /opt/src/addvpnuser.sh && ln -s /opt/src/addvpnuser.sh /usr/bin
``` ```
@ -70,7 +70,7 @@ Error: "sudo: delvpnuser.sh: command not found".
This is normal if you used an older version of the VPN setup script. First, download the helper script: This is normal if you used an older version of the VPN setup script. First, download the helper script:
```bash ```bash
wget -nv -O /opt/src/delvpnuser.sh https://get.vpnsetup.net/deluser wget -nv -O /opt/src/delvpnuser.sh https://bit.ly/delvpnuser
chmod +x /opt/src/delvpnuser.sh && ln -s /opt/src/delvpnuser.sh /usr/bin chmod +x /opt/src/delvpnuser.sh && ln -s /opt/src/delvpnuser.sh /usr/bin
``` ```
@ -92,7 +92,7 @@ Remove all existing VPN users and replace with the list of users you specify.
First, download the script: First, download the script:
```bash ```bash
wget -nv -O updatevpnusers.sh https://get.vpnsetup.net/updateusers wget -nv -O updatevpnusers.sh https://bit.ly/updatevpnusers
``` ```
To use this script, choose one of the following options: To use this script, choose one of the following options:

View File

@ -10,21 +10,10 @@
**警告:** 此[辅助脚本](../extras/vpnuninstall.sh)将从你的服务器中删除 IPsec VPN。所有的 VPN 配置将被**永久删除**,并且 Libreswan 和 xl2tpd 将被移除。此操作**不可撤销** **警告:** 此[辅助脚本](../extras/vpnuninstall.sh)将从你的服务器中删除 IPsec VPN。所有的 VPN 配置将被**永久删除**,并且 Libreswan 和 xl2tpd 将被移除。此操作**不可撤销**
```bash ```bash
wget -nv -O vpnunst.sh https://get.vpnsetup.net/unst wget -nv -O vpnunst.sh https://bit.ly/vpnuninstall
sudo bash vpnunst.sh sudo bash vpnunst.sh
``` ```
<details>
<summary>
或者,你也可以使用以下命令。
</summary>
```bash
wget -nv -O vpnunst.sh https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master/extras/vpnuninstall.sh
sudo bash vpnunst.sh
```
</details>
在完成后重启你的服务器。 在完成后重启你的服务器。
## 手动卸载 VPN ## 手动卸载 VPN

View File

@ -10,21 +10,10 @@
**Warning:** This [helper script](../extras/vpnuninstall.sh) will remove IPsec VPN from your server. All VPN configuration will be **permanently deleted**, and Libreswan and xl2tpd will be removed. This **cannot be undone**! **Warning:** This [helper script](../extras/vpnuninstall.sh) will remove IPsec VPN from your server. All VPN configuration will be **permanently deleted**, and Libreswan and xl2tpd will be removed. This **cannot be undone**!
```bash ```bash
wget -nv -O vpnunst.sh https://get.vpnsetup.net/unst wget -nv -O vpnunst.sh https://bit.ly/vpnuninstall
sudo bash vpnunst.sh sudo bash vpnunst.sh
``` ```
<details>
<summary>
Alternative script URL.
</summary>
```bash
wget -nv -O vpnunst.sh https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master/extras/vpnuninstall.sh
sudo bash vpnunst.sh
```
</details>
When finished, reboot your server. When finished, reboot your server.
## Manually uninstall the VPN ## Manually uninstall the VPN