1
0
mirror of synced 2024-11-29 08:06:04 +03:00

Update docs

This commit is contained in:
hwdsl2 2022-05-18 18:06:43 -05:00
parent 6d6ed6916e
commit 20daf65534
2 changed files with 43 additions and 43 deletions

View File

@ -43,29 +43,6 @@ curl -fsSL https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master/vpnsetup.sh -o
</details> </details>
<details> <details>
<summary> <summary>
可选IPsec VPN + OpenVPN + WireGuard 服务器。
</summary>
成功安装 IPsec VPN 后,高级用户可以选择在同一台服务器上安装 [OpenVPN](https://openvpn.net) 和/或 [WireGuard](https://www.wireguard.com)。这是可选的。为确保兼容性,必须先安装 IPsec VPN。
要安装 OpenVPN:
```bash
wget https://get.vpnsetup.net/ovpn -nv -O openvpn.sh
sudo bash openvpn.sh
```
要安装 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) 和 [Nyr/wireguard-install](https://github.com/Nyr/wireguard-install)。任何相关问题都应该在链接的 GitHub 代码库中报告,而不是这里。
</details>
<details>
<summary>
查看 VPN 脚本的示例输出(终端记录)。 查看 VPN 脚本的示例输出(终端记录)。
</summary> </summary>
@ -73,6 +50,29 @@ sudo bash wireguard.sh
<p align="center"><img src="docs/images/script-demo.svg"></p> <p align="center"><img src="docs/images/script-demo.svg"></p>
</details> </details>
<details>
<summary>
搭建 IPsec VPN + OpenVPN + WireGuard 服务器。
</summary>
成功安装 IPsec VPN 后,你可以在同一台服务器上安装 [OpenVPN](https://openvpn.net) 和/或 [WireGuard](https://www.wireguard.com)。这是可选的。
安装 OpenVPN:
```bash
wget https://get.vpnsetup.net/ovpn -nv -O openvpn.sh
sudo bash openvpn.sh
```
安装 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 代码库中报告。
</details>
另外,你也可以使用预构建的 [Docker 镜像](https://github.com/hwdsl2/docker-ipsec-vpn-server/blob/master/README-zh.md)。如需了解其它选项以及客户端配置,请继续阅读以下部分。 另外,你也可以使用预构建的 [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>
<details> <details>
<summary> <summary>
可选:IPsec VPN + OpenVPN + WireGuard 服务器。 搭建 IPsec VPN + OpenVPN + WireGuard 服务器。
</summary> </summary>
成功安装 IPsec VPN 后,高级用户可以选择在同一台服务器上安装 [OpenVPN](https://openvpn.net) 和/或 [WireGuard](https://www.wireguard.com)。这是可选的。为确保兼容性,必须先安装 IPsec VPN。 成功安装 IPsec VPN 后,你可以在同一台服务器上安装 [OpenVPN](https://openvpn.net) 和/或 [WireGuard](https://www.wireguard.com)。这是可选的。
安装 OpenVPN: 安装 OpenVPN:
```bash ```bash
wget https://get.vpnsetup.net/ovpn -nv -O openvpn.sh wget https://get.vpnsetup.net/ovpn -nv -O openvpn.sh
sudo bash openvpn.sh sudo bash openvpn.sh
``` ```
要安装 WireGuard 安装 WireGuard:
```bash ```bash
wget https://get.vpnsetup.net/wg -nv -O wireguard.sh wget https://get.vpnsetup.net/wg -nv -O wireguard.sh
sudo bash wireguard.sh sudo bash wireguard.sh
``` ```
这些脚本分别来自 [Nyr/openvpn-install](https://github.com/Nyr/openvpn-install) 和 [Nyr/wireguard-install](https://github.com/Nyr/wireguard-install)。任何相关问题都应该在链接的 GitHub 代码库中报告,而不是这里 这些脚本来自 [Nyr/openvpn-install](https://github.com/Nyr/openvpn-install) 和 [wireguard-install](https://github.com/Nyr/wireguard-install),稍作改动以提高与 IPsec VPN 的兼容性。任何相关问题请到链接的 GitHub 代码库中报告
</details> </details>
<details> <details>
<summary> <summary>

View File

@ -43,10 +43,19 @@ If you are unable to download, open [vpnsetup.sh](vpnsetup.sh), then click the `
</details> </details>
<details> <details>
<summary> <summary>
Optional: IPsec VPN + OpenVPN + WireGuard server. See the VPN script in action (terminal recording).
</summary> </summary>
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. **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>
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.
To install OpenVPN: To install OpenVPN:
@ -62,16 +71,7 @@ wget https://get.vpnsetup.net/wg -nv -O wireguard.sh
sudo bash wireguard.sh sudo bash wireguard.sh
``` ```
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. These scripts are from [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. Please report any related issues to the linked GitHub repositories.
</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> </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. 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>
<details> <details>
<summary> <summary>
Optional: IPsec VPN + OpenVPN + WireGuard server. Set up an IPsec VPN + OpenVPN + WireGuard server.
</summary> </summary>
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. 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.
To install OpenVPN: To install OpenVPN:
@ -199,7 +199,7 @@ wget https://get.vpnsetup.net/wg -nv -O wireguard.sh
sudo bash wireguard.sh sudo bash wireguard.sh
``` ```
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. These scripts are from [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. Please report any related issues to the linked GitHub repositories.
</details> </details>
<details> <details>
<summary> <summary>