Compare commits
No commits in common. "99f8f1e3d217edf80db7bc865440fe1170ab00a7" and "6d6ed6916e627a50d4796c392eed2f9c063104b7" have entirely different histories.
99f8f1e3d2
...
6d6ed6916e
38
README-zh.md
38
README-zh.md
@ -43,35 +43,35 @@ curl -fsSL https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master/vpnsetup.sh -o
|
||||
</details>
|
||||
<details>
|
||||
<summary>
|
||||
查看 VPN 脚本的示例输出（终端记录）。
|
||||
可选：IPsec VPN + OpenVPN + WireGuard 服务器。
|
||||
</summary>
|
||||
|
||||
**注：** 此终端记录仅用于演示目的。该记录中的 VPN 凭据 **无效**。
|
||||
成功安装 IPsec VPN 后，高级用户可以选择在同一台服务器上安装 [OpenVPN](https://openvpn.net) 和/或 [WireGuard](https://www.wireguard.com)。这是可选的。为确保兼容性，必须先安装 IPsec VPN。
|
||||
|
||||
<p align="center"><img src="docs/images/script-demo.svg"></p>
|
||||
</details>
|
||||
<details>
|
||||
<summary>
|
||||
可选：搭建 IPsec VPN + OpenVPN + WireGuard 服务器。
|
||||
</summary>
|
||||
|
||||
成功安装 IPsec VPN 后，你可以在同一台服务器上安装 [OpenVPN](https://openvpn.net) 和/或 [WireGuard](https://www.wireguard.com)。这是可选的。
|
||||
|
||||
安装 OpenVPN:
|
||||
要安装 OpenVPN:
|
||||
|
||||
```bash
|
||||
wget https://get.vpnsetup.net/ovpn -nv -O openvpn.sh
|
||||
sudo bash openvpn.sh
|
||||
```
|
||||
|
||||
安装 WireGuard:
|
||||
要安装 WireGuard：
|
||||
|
||||
```bash
|
||||
wget https://get.vpnsetup.net/wg -nv -O wireguard.sh
|
||||
sudo bash wireguard.sh
|
||||
```
|
||||
|
||||
这些脚本是在 [Nyr/openvpn-install](https://github.com/Nyr/openvpn-install) 和 [wireguard-install](https://github.com/Nyr/wireguard-install) 的基础上稍作改动以提高与 IPsec VPN 的兼容性。你可以在安装后再次运行这些脚本来管理用户或卸载。任何问题请到链接的 GitHub 代码库中报告，而不是这里。
|
||||
这些脚本分别来自 [Nyr/openvpn-install](https://github.com/Nyr/openvpn-install) 和 [Nyr/wireguard-install](https://github.com/Nyr/wireguard-install)。任何相关问题都应该在链接的 GitHub 代码库中报告，而不是这里。
|
||||
</details>
|
||||
<details>
|
||||
<summary>
|
||||
查看 VPN 脚本的示例输出（终端记录）。
|
||||
</summary>
|
||||
|
||||
**注：** 此终端记录仅用于演示目的。该记录中的 VPN 凭据 **无效**。
|
||||
|
||||
<p align="center"><img src="docs/images/script-demo.svg"></p>
|
||||
</details>
|
||||
|
||||
另外，你也可以使用预构建的 [Docker 镜像](https://github.com/hwdsl2/docker-ipsec-vpn-server/blob/master/README-zh.md)。如需了解其它选项以及客户端配置，请继续阅读以下部分。
|
||||
@ -180,26 +180,26 @@ sudo VPN_PROTECT_CONFIG=yes sh vpn.sh
|
||||
</details>
|
||||
<details>
|
||||
<summary>
|
||||
可选：搭建 IPsec VPN + OpenVPN + WireGuard 服务器。
|
||||
可选：IPsec VPN + OpenVPN + WireGuard 服务器。
|
||||
</summary>
|
||||
|
||||
成功安装 IPsec VPN 后，你可以在同一台服务器上安装 [OpenVPN](https://openvpn.net) 和/或 [WireGuard](https://www.wireguard.com)。这是可选的。
|
||||
成功安装 IPsec VPN 后，高级用户可以选择在同一台服务器上安装 [OpenVPN](https://openvpn.net) 和/或 [WireGuard](https://www.wireguard.com)。这是可选的。为确保兼容性，必须先安装 IPsec VPN。
|
||||
|
||||
安装 OpenVPN:
|
||||
要安装 OpenVPN:
|
||||
|
||||
```bash
|
||||
wget https://get.vpnsetup.net/ovpn -nv -O openvpn.sh
|
||||
sudo bash openvpn.sh
|
||||
```
|
||||
|
||||
安装 WireGuard:
|
||||
要安装 WireGuard：
|
||||
|
||||
```bash
|
||||
wget https://get.vpnsetup.net/wg -nv -O wireguard.sh
|
||||
sudo bash wireguard.sh
|
||||
```
|
||||
|
||||
这些脚本是在 [Nyr/openvpn-install](https://github.com/Nyr/openvpn-install) 和 [wireguard-install](https://github.com/Nyr/wireguard-install) 的基础上稍作改动以提高与 IPsec VPN 的兼容性。你可以在安装后再次运行这些脚本来管理用户或卸载。任何问题请到链接的 GitHub 代码库中报告，而不是这里。
|
||||
这些脚本分别来自 [Nyr/openvpn-install](https://github.com/Nyr/openvpn-install) 和 [Nyr/wireguard-install](https://github.com/Nyr/wireguard-install)。任何相关问题都应该在链接的 GitHub 代码库中报告，而不是这里。
|
||||
</details>
|
||||
<details>
|
||||
<summary>
|
||||
|
||||
30
README.md
30
README.md
@ -43,19 +43,10 @@ If you are unable to download, open [vpnsetup.sh](vpnsetup.sh), then click the `
|
||||
</details>
|
||||
<details>
|
||||
<summary>
|
||||
See the VPN script in action (terminal recording).
|
||||
Optional: IPsec VPN + OpenVPN + WireGuard server.
|
||||
</summary>
|
||||
|
||||
**Note:** This recording is for demo purposes only. VPN credentials in this recording are **NOT** valid.
|
||||
|
||||
<p align="center"><img src="docs/images/script-demo.svg"></p>
|
||||
</details>
|
||||
<details>
|
||||
<summary>
|
||||
Optional: Set up an IPsec VPN + OpenVPN + WireGuard server.
|
||||
</summary>
|
||||
|
||||
After successful installation of the IPsec VPN, you may optionally install [OpenVPN](https://openvpn.net) and/or [WireGuard](https://www.wireguard.com) on the same server.
|
||||
After successful installation of the IPsec VPN, advanced users can optionally install [OpenVPN](https://openvpn.net) and/or [WireGuard](https://www.wireguard.com) on the same server. To ensure compatibility, the IPsec VPN must be installed first.
|
||||
|
||||
To install OpenVPN:
|
||||
|
||||
@ -71,7 +62,16 @@ wget https://get.vpnsetup.net/wg -nv -O wireguard.sh
|
||||
sudo bash wireguard.sh
|
||||
```
|
||||
|
||||
These scripts are based on [Nyr/openvpn-install](https://github.com/Nyr/openvpn-install) and [wireguard-install](https://github.com/Nyr/wireguard-install), with minor changes for compatibility with the IPsec VPN. You may run these scripts again after install to manage users or uninstall. Please report any issues to the linked GitHub repositories, not here.
|
||||
These scripts are from [Nyr/openvpn-install](https://github.com/Nyr/openvpn-install) and [Nyr/wireguard-install](https://github.com/Nyr/wireguard-install), respectively. Report any related issues to the linked GitHub repos, not here.
|
||||
</details>
|
||||
<details>
|
||||
<summary>
|
||||
See the VPN script in action (terminal recording).
|
||||
</summary>
|
||||
|
||||
**Note:** This recording is for demo purposes only. VPN credentials in this recording are **NOT** valid.
|
||||
|
||||
<p align="center"><img src="docs/images/script-demo.svg"></p>
|
||||
</details>
|
||||
|
||||
A pre-built [Docker image](https://github.com/hwdsl2/docker-ipsec-vpn-server) is also available. For other options and client setup, read the sections below.
|
||||
@ -180,10 +180,10 @@ sudo VPN_PROTECT_CONFIG=yes sh vpn.sh
|
||||
</details>
|
||||
<details>
|
||||
<summary>
|
||||
Optional: Set up an IPsec VPN + OpenVPN + WireGuard server.
|
||||
Optional: IPsec VPN + OpenVPN + WireGuard server.
|
||||
</summary>
|
||||
|
||||
After successful installation of the IPsec VPN, you may optionally install [OpenVPN](https://openvpn.net) and/or [WireGuard](https://www.wireguard.com) on the same server.
|
||||
After successful installation of the IPsec VPN, advanced users can optionally install [OpenVPN](https://openvpn.net) and/or [WireGuard](https://www.wireguard.com) on the same server. To ensure compatibility, the IPsec VPN must be installed first.
|
||||
|
||||
To install OpenVPN:
|
||||
|
||||
@ -199,7 +199,7 @@ wget https://get.vpnsetup.net/wg -nv -O wireguard.sh
|
||||
sudo bash wireguard.sh
|
||||
```
|
||||
|
||||
These scripts are based on [Nyr/openvpn-install](https://github.com/Nyr/openvpn-install) and [wireguard-install](https://github.com/Nyr/wireguard-install), with minor changes for compatibility with the IPsec VPN. You may run these scripts again after install to manage users or uninstall. Please report any issues to the linked GitHub repositories, not here.
|
||||
These scripts are from [Nyr/openvpn-install](https://github.com/Nyr/openvpn-install) and [Nyr/wireguard-install](https://github.com/Nyr/wireguard-install), respectively. Report any related issues to the linked GitHub repos, not here.
|
||||
</details>
|
||||
<details>
|
||||
<summary>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user