From 20daf65534193f309ac33e9b1a15408fa9f22b1e Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Wed, 18 May 2022 18:06:43 -0500 Subject: [PATCH] Update docs --- README-zh.md | 56 ++++++++++++++++++++++++++-------------------------- README.md | 30 ++++++++++++++-------------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/README-zh.md b/README-zh.md index bd8606b..9189f74 100644 --- a/README-zh.md +++ b/README-zh.md @@ -43,29 +43,6 @@ curl -fsSL https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master/vpnsetup.sh -o
-可选：IPsec VPN + OpenVPN + WireGuard 服务器。 - - -成功安装 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 代码库中报告，而不是这里。 -
-
- 查看 VPN 脚本的示例输出（终端记录）。 @@ -73,6 +50,29 @@ sudo bash wireguard.sh

+
+ +搭建 IPsec VPN + OpenVPN + WireGuard 服务器。 + + +成功安装 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 代码库中报告。 +
另外，你也可以使用预构建的 [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
-可选：IPsec VPN + OpenVPN + WireGuard 服务器。 +搭建 IPsec VPN + OpenVPN + WireGuard 服务器。 -成功安装 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 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) 和 [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 代码库中报告。
diff --git a/README.md b/README.md index 0d55843..ca5cde0 100644 --- a/README.md +++ b/README.md @@ -43,10 +43,19 @@ If you are unable to download, open [vpnsetup.sh](vpnsetup.sh), then click the `
-Optional: IPsec VPN + OpenVPN + WireGuard server. +See the VPN script in action (terminal recording). -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. + +

+
+
+ +Set up an IPsec VPN + OpenVPN + WireGuard server. + + +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: @@ -62,16 +71,7 @@ wget https://get.vpnsetup.net/wg -nv -O 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. -
-
- -See the VPN script in action (terminal recording). - - -**Note:** This recording is for demo purposes only. VPN credentials in this recording are **NOT** valid. - -

+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.
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
-Optional: IPsec VPN + OpenVPN + WireGuard server. +Set up an IPsec VPN + OpenVPN + WireGuard 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. +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: @@ -199,7 +199,7 @@ wget https://get.vpnsetup.net/wg -nv -O 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.