From 60716c065456ac4b2f17827792c00aeeb639c117 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Sun, 22 Sep 2019 20:46:24 -0700 Subject: [PATCH] Update docs --- README-zh.md | 4 +++- README.md | 4 +++- docs/clients-xauth-zh.md | 2 +- docs/clients-xauth.md | 2 +- docs/clients-zh.md | 32 ++++++++++++++++---------------- docs/clients.md | 32 ++++++++++++++++---------------- 6 files changed, 40 insertions(+), 36 deletions(-) diff --git a/README-zh.md b/README-zh.md index f3b0bb5..dfc1808 100644 --- a/README-zh.md +++ b/README-zh.md @@ -146,7 +146,9 @@ sh vpnsetup.sh *其他语言版本: [English](README.md#important-notes), [简体中文](README-zh.md#重要提示).* -**Windows 用户** 在首次连接之前需要修改注册表，以解决 VPN 服务器 和/或 客户端与 NAT（比如家用路由器）的兼容问题。 +**Windows 用户** 在首次连接之前需要修改注册表，以解决 VPN 服务器和/或客户端与 NAT（比如家用路由器）的兼容问题。 + +**Android 6 和 7 用户**：如果你遇到连接问题，请尝试 这些步骤。 同一个 VPN 账户可以在你的多个设备上使用。但是由于 IPsec/L2TP 的局限性，如果需要同时连接在同一个 NAT （比如家用路由器）后面的多个设备到 VPN 服务器，你必须仅使用 IPsec/XAuth 模式。 diff --git a/README.md b/README.md index c193fb6..e0fe8d2 100644 --- a/README.md +++ b/README.md @@ -146,7 +146,9 @@ Enjoy your very own VPN! :sparkles::tada::rocket::sparkles: *Read this in other languages: [English](README.md#important-notes), [简体中文](README-zh.md#重要提示).* -For **Windows users**, this one-time registry change is required if the VPN server and/or client is behind NAT (e.g. home router). +**Windows users**: This one-time registry change is required if the VPN server and/or client is behind NAT (e.g. home router). + +**Android 6 and 7 users**: If you encounter connection issues, try these steps. The same VPN account can be used by your multiple devices. However, due to an IPsec/L2TP limitation, if you wish to connect multiple devices simultaneously from behind the same NAT (e.g. home router), you must use only IPsec/XAuth mode. diff --git a/docs/clients-xauth-zh.md b/docs/clients-xauth-zh.md index 7c22abe..f65795b 100644 --- a/docs/clients-xauth-zh.md +++ b/docs/clients-xauth-zh.md @@ -65,7 +65,7 @@ VPN 连接成功后，你会在 VPN Connect 状态窗口中看到 **tunnel enabl ## Android 1. 启动 **设置** 应用程序。 -1. 在 **无线和网络** 部分单击 **更多...**。 +1. 单击 **网络和互联网**。或者，如果你使用 Android 7 或更早版本，在 **无线和网络** 部分单击 **更多...**。 1. 单击 **VPN**。 1. 单击 **添加VPN配置文件** 或窗口右上角的 **+**。 1. 在 **名称** 字段中输入任意内容。 diff --git a/docs/clients-xauth.md b/docs/clients-xauth.md index cf3aaec..d59c0d9 100644 --- a/docs/clients-xauth.md +++ b/docs/clients-xauth.md @@ -65,7 +65,7 @@ If you get an error when trying to connect, see 故意设计的 并且不能被配置。如果你需要 VPN 在设备唤醒后自动重连，可以另外尝试使用 OpenVPN，它支持 一些选项 比如 "Reconnect on Wakeup" 和 "Seamless Tunnel"。 Android 设备在进入睡眠模式不久后也会断开 Wi-Fi 连接，如果你没有启用选项 "睡眠期间保持 WLAN 开启" 的话。该选项在 Android 8 (Oreo) 中不再可用。 另外，你也可以尝试打开 "始终开启 VPN" 选项以保持连接。详情请看 这里。 -### iOS 13 连接问题 - -如果你的 iOS 13 设备 (iPhone/iPad) 可以连接到 VPN 但是不能上网，请尝试以下步骤：编辑 VPN 服务器上的 `/etc/ipsec.conf`。找到 `sha2-truncbug=yes` 并将它替换为 `sha2-truncbug=no`。保存修改并运行 `service ipsec restart`。 - -### Android 6 及以上版本 - -如果你无法使用 Android 6 或以上版本连接： - -1. 单击 VPN 连接旁边的设置按钮，选择 "Show advanced options" 并且滚动到底部。如果选项 "Backward compatible mode" 存在（看下图），请启用它并重试连接。如果不存在，请尝试下一步。 -1. 编辑 VPN 服务器上的 `/etc/ipsec.conf`。找到 `sha2-truncbug=yes` 并将它替换为 `sha2-truncbug=no`。保存修改并运行 `service ipsec restart` (参见) - -![Android VPN workaround](images/vpn-profile-Android.png) - ### Debian 10 内核 Debian 10 用户： 运行 `uname -r` 以检查你的服务器的 Linux 内核版本。如果它包含 `cloud` 字样，并且 `/dev/ppp` 不存在，则该内核缺少 `ppp` 支持从而不能使用 IPsec/L2TP 模式（[IPsec/XAuth 模式](clients-xauth-zh.md) 不受影响）。 diff --git a/docs/clients.md b/docs/clients.md index 99089a3..b2e7803 100644 --- a/docs/clients.md +++ b/docs/clients.md @@ -106,7 +106,7 @@ If you get an error when trying to connect, see Troub ## Android 1. Launch the **Settings** application. -1. Tap **More...** in the **Wireless & Networks** section. +1. Tap "Network & internet". Or, if using Android 7 or earlier, tap **More...** in the **Wireless & networks** section. 1. Tap **VPN**. 1. Tap **Add VPN Profile** or the **+** icon at top-right of screen. 1. Enter anything you like in the **Name** field. @@ -207,9 +207,9 @@ First check by design and cannot be configured. If you need the VPN to auto-reconnect when the device wakes up, try OpenVPN instead, which has support for options such as "Reconnect on Wakeup" and "Seamless Tunnel". Android devices will also disconnect Wi-Fi shortly after entering sleep mode, unless the option "Keep Wi-Fi on during sleep" is enabled. This option is no longer available in Android 8 (Oreo). Alternatively, you may try enabling the "Always-on VPN" option to stay connected. Learn more here. -### iOS 13 connection issues - -If your iOS 13 device (iPhone/iPad) can connect to the VPN but cannot access the Internet, try these steps: 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`. - -### Android 6 and above - -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 (see image below), enable it and reconnect the VPN. If not, try the next step. -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) - ### Debian 10 kernel Debian 10 users: Run `uname -r` to check your server's Linux kernel version. If it contains the word "cloud", and `/dev/ppp` is missing, then the kernel lacks `ppp` support and cannot use IPsec/L2TP mode ([IPsec/XAuth mode](clients-xauth.md) is not affected).