From a3dae331b82266c5ae47c44f2c884978ffb62d63 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Mon, 18 Jan 2021 00:02:04 -0600 Subject: [PATCH] Update docs --- README-zh.md | 14 +++++++++++++- README.md | 12 ++++++++++++ docs/ikev2-howto-zh.md | 6 ++++-- docs/ikev2-howto.md | 6 ++++-- 4 files changed, 33 insertions(+), 5 deletions(-) diff --git a/README-zh.md b/README-zh.md index 23172a6..943d00e 100644 --- a/README-zh.md +++ b/README-zh.md @@ -8,7 +8,7 @@ IPsec VPN 可以加密你的网络流量，以防止在通过因特网传送时 我们将使用 Libreswan 作为 IPsec 服务器，以及 xl2tpd 作为 L2TP 提供者。 -**» 另见： Docker 上的 IPsec VPN 服务器** +**» 另见：Docker 上的 IPsec VPN 服务器** *其他语言版本: [English](README.md), [简体中文](README-zh.md).* @@ -64,6 +64,12 @@ wget https://git.io/vpnsetup-amzn -O vpnsetup.sh && sudo sh vpnsetup.sh 你的 VPN 登录凭证将会被自动随机生成，并在安装完成后显示在屏幕上。 +在安装成功之后，推荐 配置 IKEv2： + +```bash +wget https://git.io/ikev2setup -O ikev2.sh && sudo bash ikev2.sh --auto +``` + 如需了解其它安装选项，以及如何配置 VPN 客户端，请继续阅读以下部分。 @@ -241,6 +247,12 @@ sh vpnsetup.sh ``` +在安装成功之后，推荐 配置 IKEv2： + +```bash +wget https://git.io/ikev2setup -O ikev2.sh && sudo bash ikev2.sh --auto +``` + **注：** 如果无法通过 `wget` 下载，你也可以打开 vpnsetup.sh，vpnsetup_centos.sh 或者 vpnsetup_amzn.sh，然后点击右方的 **`Raw`** 按钮。按快捷键 `Ctrl-A` 全选， `Ctrl-C` 复制，然后粘贴到你喜欢的编辑器。 ## 下一步 diff --git a/README.md b/README.md index 6198713..520ce84 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,12 @@ wget https://git.io/vpnsetup-amzn -O vpnsetup.sh && sudo sh vpnsetup.sh Your VPN login details will be randomly generated, and displayed on the screen when finished. +After successful installation, it is recommended to set up IKEv2: + +```bash +wget https://git.io/ikev2setup -O ikev2.sh && sudo bash ikev2.sh --auto +``` + For other installation options and how to set up VPN clients, read the sections below. @@ -241,6 +247,12 @@ sh vpnsetup.sh ``` +After successful installation, it is recommended to set up IKEv2: + +```bash +wget https://git.io/ikev2setup -O ikev2.sh && sudo bash ikev2.sh --auto +``` + **Note:** If unable to download via `wget`, you may also open vpnsetup.sh, vpnsetup_centos.sh or vpnsetup_amzn.sh, and click the **`Raw`** button on the right. Press `Ctrl-A` to select all, `Ctrl-C` to copy, then paste into your favorite editor. ## Next steps diff --git a/docs/ikev2-howto-zh.md b/docs/ikev2-howto-zh.md index c7a6656..e788e6d 100644 --- a/docs/ikev2-howto-zh.md +++ b/docs/ikev2-howto-zh.md @@ -33,10 +33,12 @@ Libreswan 支持通过使用 RSA 签名算法的 X.509 Machine Certificates 来 你可以使用这个辅助脚本来自动地在 VPN 服务器上配置 IKEv2： ``` -wget https://bit.ly/ikev2setup -O ikev2.sh && sudo bash ikev2.sh +wget https://git.io/ikev2setup -O ikev2.sh && sudo bash ikev2.sh --auto ``` -该 脚本 必须使用 `bash` 而不是 `sh` 运行。按照脚本的提示配置 IKEv2。在完成之后，请转到 [配置 IKEv2 VPN 客户端](#配置-ikev2-vpn-客户端) 和 [已知问题](#已知问题)。如果要为更多的客户端生成证书，只需重新运行脚本。 +该 脚本 必须使用 `bash` 而不是 `sh` 运行。以上命令使用自动模式和默认选项运行辅助脚本。如果你想要自定义 IKEv2 安装选项，请在运行脚本时去掉 `--auto` 参数。 + +在完成之后，请转到 [配置 IKEv2 VPN 客户端](#配置-ikev2-vpn-客户端)。如果要为更多的客户端生成证书，只需重新运行脚本。 ## 配置 IKEv2 VPN 客户端 diff --git a/docs/ikev2-howto.md b/docs/ikev2-howto.md index 9ad9603..178cd16 100644 --- a/docs/ikev2-howto.md +++ b/docs/ikev2-howto.md @@ -33,10 +33,12 @@ After following this guide, you will be able to connect to the VPN using IKEv2 i You may use this helper script to automatically set up IKEv2 on the VPN server: ``` -wget https://bit.ly/ikev2setup -O ikev2.sh && sudo bash ikev2.sh +wget https://git.io/ikev2setup -O ikev2.sh && sudo bash ikev2.sh --auto ``` -The script must be run using `bash`, not `sh`. Follow the prompts to set up IKEv2. When finished, continue to [configure IKEv2 VPN clients](#configure-ikev2-vpn-clients) and check [known issues](#known-issues). If you want to generate certificates for additional VPN clients, just run the script again. +The script must be run using `bash`, not `sh`. The command above runs the helper script in auto mode, using default options. Remove the `--auto` parameter if you want to customize IKEv2 setup options. + +When finished, continue to [configure IKEv2 VPN clients](#configure-ikev2-vpn-clients). If you want to generate certificates for additional VPN clients, just run the script again. ## Configure IKEv2 VPN clients