From a3ee9ce03361aaf0b8da15cfd9f10428cd62eee1 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Tue, 8 May 2018 01:05:22 -0500 Subject: [PATCH] Update docs --- README-zh.md | 5 ++--- README.md | 5 ++--- docs/clients-zh.md | 7 ++----- docs/clients.md | 7 ++----- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/README-zh.md b/README-zh.md index 928d832..5360c49 100644 --- a/README-zh.md +++ b/README-zh.md @@ -58,7 +58,7 @@ wget https://git.io/vpnsetup -O vpnsetup.sh && sudo sh vpnsetup.sh ## 系统要求 一个新创建的 Amazon EC2 实例，使用这些映像 (AMIs): -- Ubuntu 16.04 (Xenial) or 14.04 (Trusty)[*](#ubuntu-1804-note) +- Ubuntu 16.04 (Xenial) or 14.04 (Trusty) - Debian 9 (Stretch) or 8 (Jessie) - CentOS 7 (x86_64) with Updates - CentOS 6 (x86_64) with Updates @@ -77,8 +77,7 @@ wget https://git.io/vpnsetup -O vpnsetup.sh && sudo sh vpnsetup.sh 高级用户可以在 $35 Raspberry Pi 3 上搭建 VPN 服务器。 - -\***注：** 目前脚本还不支持 Ubuntu 18.04，因为一个 xl2tpd 与 Linux 内核 4.15 兼容性的 问题。 +**注：** 目前脚本还不支持 Ubuntu 18.04，因为一个 xl2tpd 与 Linux 内核 4.15 兼容性的 问题。 :warning: **不要** 在你的 PC 或者 Mac 上运行这些脚本！它们只能用在服务器上！ diff --git a/README.md b/README.md index f8c0d46..08b07f1 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ For other installation options and how to set up VPN clients, read the sections ## Requirements A newly created Amazon EC2 instance, from these images (AMIs): -- Ubuntu 16.04 (Xenial) or 14.04 (Trusty)[*](#ubuntu-1804-note) +- Ubuntu 16.04 (Xenial) or 14.04 (Trusty) - Debian 9 (Stretch) or 8 (Jessie) - CentOS 7 (x86_64) with Updates - CentOS 6 (x86_64) with Updates @@ -77,8 +77,7 @@ This also includes Linux VMs in public clouds, such as Raspberry Pi 3. - -\***Note:** Ubuntu 18.04 is not yet supported due to an xl2tpd issue with Linux kernel 4.15. +**Note:** Ubuntu 18.04 is not yet supported due to an xl2tpd issue with Linux kernel 4.15. :warning: **DO NOT** run these scripts on your PC or Mac! They should only be used on a server! diff --git a/docs/clients-zh.md b/docs/clients-zh.md index 3b75b82..2bef225 100644 --- a/docs/clients-zh.md +++ b/docs/clients-zh.md @@ -6,8 +6,6 @@ 在成功搭建自己的 VPN 服务器之后，你可以按照下面的步骤来配置你的设备。IPsec/L2TP 在 Android, iOS, OS X 和 Windows 上均受支持，无需安装额外的软件。设置过程通常只需要几分钟。如果无法连接,请首先检查是否输入了正确的 VPN 登录凭证。 -另一个带图片的安装指南可供参考，它由 Tony Tran 编写。 - --- * 平台名称 * [Windows](#windows) @@ -406,14 +404,13 @@ REG ADD HKLM\SYSTEM\CurrentControlSet\Services\RasMan\Parameters /v ProhibitIpSe 如果你无法使用 Android 6 或以上版本连接： 1. 单击 VPN 连接旁边的设置按钮，选择 "Show advanced options" 并且滚动到底部。如果选项 "Backward compatible mode" 存在，请启用它并重试连接。如果不存在，请尝试下一步。 -1. 编辑 VPN 服务器上的 `/etc/ipsec.conf`。找到 `sha2-truncbug=no` 并将它替换为 `sha2-truncbug=yes`。保存修改并运行 `service ipsec restart`。(参见) 如果仍然无法连接，请尝试下一步。 -1. 编辑 VPN 服务器上的 `/etc/ipsec.conf`。在 `ike=` 和 `phase2alg=` 两行的末尾添加 `,aes256-sha2_512` 字样。保存修改并运行 `service ipsec restart`。(参见) +1. 编辑 VPN 服务器上的 `/etc/ipsec.conf`。找到 `sha2-truncbug=yes` 并将它替换为 `sha2-truncbug=no`。保存修改并运行 `service ipsec restart`。(参见) ![Android VPN workaround](images/vpn-profile-Android.png) ### Chromebook -Chromebook 用户： 如果你无法连接，请尝试 这个解决方案。 +Chromebook 用户： 如果你无法连接，请参见 这个 Issue。请注意，这个解决方案可能会导致你的其它设备无法连接到 VPN。编辑 VPN 服务器上的 `/etc/ipsec.conf`。找到 `phase2alg=...` 并将它替换为 `phase2alg=aes_gcm-null`。保存修改并运行 `service ipsec restart`。 ### 其它错误 diff --git a/docs/clients.md b/docs/clients.md index b368cda..5fc3b2e 100644 --- a/docs/clients.md +++ b/docs/clients.md @@ -6,8 +6,6 @@ After setting up your own VPN server, follow these steps to configure your devices. IPsec/L2TP is natively supported by Android, iOS, OS X, and Windows. There is no additional software to install. Setup should only take a few minutes. In case you are unable to connect, first check to make sure the VPN credentials were entered correctly. -An alternative setup guide with images is available, written by Tony Tran. - --- * Platforms * [Windows](#windows) @@ -405,14 +403,13 @@ To fix this error, please follow these steps: If you are unable to connect using Android 6 or above: 1. Tap the "Settings" icon next to your VPN profile. Select "Show advanced options" and scroll down to the bottom. If the option "Backward compatible mode" exists, enable it and reconnect the VPN. If not, try the next step. -1. Edit `/etc/ipsec.conf` on the VPN server. Find `sha2-truncbug=no` and replace it with `sha2-truncbug=yes`. Save the file and run `service ipsec restart`. (Ref) If still unable to connect, try the next step. -1. Edit `/etc/ipsec.conf` on the VPN server. Append `,aes256-sha2_512` to the end of both `ike=` and `phase2alg=` lines. Save the file and run `service ipsec restart`. (Ref) +1. Edit `/etc/ipsec.conf` on the VPN server. Find `sha2-truncbug=yes` and replace it with `sha2-truncbug=no`. Save the file and run `service ipsec restart`. (Ref) ![Android VPN workaround](images/vpn-profile-Android.png) ### Chromebook -Chromebook users: If you are unable to connect, try this workaround. +Chromebook users: If you are unable to connect, refer to this issue. Please note that this fix may break VPN connectivity from your other devices. Edit `/etc/ipsec.conf` on the VPN server. Find `phase2alg=...` and replace it with `phase2alg=aes_gcm-null`. Save the file and run `service ipsec restart`. ### Other errors