From 96f53133e77cdd74845e0799f09dfd7c0f809d54 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Sat, 25 Sep 2021 22:52:40 -0500 Subject: [PATCH] Update docs --- docs/clients-zh.md | 12 +++++------- docs/clients.md | 12 +++++------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/docs/clients-zh.md b/docs/clients-zh.md index 11991e3..5e63edd 100644 --- a/docs/clients-zh.md +++ b/docs/clients-zh.md @@ -229,7 +229,7 @@ Fedora 28（和更新版本）和 CentOS 8/7 用户可以使用 [IPsec/XAuth](cl * [Android MTU/MSS 问题](#android-mtumss-问题) * [Android 6 和 7](#android-6-和-7) * [macOS 通过 VPN 发送通信](#macos-通过-vpn-发送通信) -* [iOS 13 和 macOS 10.15/11](#ios-13-和-macos-101511) +* [iOS 13+ 和 macOS 10.15/11+](#ios-13-和-macos-101511) * [iOS/Android 睡眠模式](#iosandroid-睡眠模式) * [Debian 11/10 内核](#debian-1110-内核) * [其它错误](#其它错误) @@ -289,7 +289,7 @@ Fedora 28（和更新版本）和 CentOS 8/7 用户可以使用 [IPsec/XAuth](cl 1. 单击 **确定** 关闭 **高级设置**。 1. 单击 **确定** 保存 VPN 连接的详细信息。 -![Select CHAP in VPN connection properties](images/vpn-properties-zh.png) +请参见 VPN 连接属性对话框的[屏幕截图](images/vpn-properties-zh.png)。 ### Windows 10 正在连接 @@ -332,13 +332,11 @@ echo 1 > /proc/sys/net/ipv4/ip_no_pmtu_disc 如果你的 Android 6.x 或者 7.x 设备无法连接，请尝试以下步骤： -1. 单击 VPN 连接旁边的设置按钮，选择 "Show advanced options" 并且滚动到底部。如果选项 "Backward compatible mode" 存在（看下图），请启用它并重试连接。如果不存在，请尝试下一步。 +1. 单击 VPN 连接旁边的设置按钮，选择 "Show advanced options" 并且滚动到底部。如果选项 "Backward compatible mode" 存在（参见[屏幕截图](images/vpn-profile-Android.png)），请启用它并重试连接。如果不存在，请尝试下一步。 1. 编辑 VPN 服务器上的 `/etc/ipsec.conf`。找到 `sha2-truncbug` 一行并切换它的值。也就是说，将 `sha2-truncbug=no` 替换为 `sha2-truncbug=yes`，或者将 `sha2-truncbug=yes` 替换为 `sha2-truncbug=no`。保存修改并运行 `service ipsec restart`。然后重新连接 VPN。 **Docker 用户：** 如需在 `/etc/ipsec.conf` 中设置 `sha2-truncbug=yes`（默认为 `no`），你可以在[你的 env 文件](https://github.com/hwdsl2/docker-ipsec-vpn-server/blob/master/README-zh.md#如何使用本镜像)中添加 `VPN_SHA2_TRUNCBUG=yes`，然后重新创建 Docker 容器。 -![Android VPN workaround](images/vpn-profile-Android.png) - ### macOS 通过 VPN 发送通信 OS X (macOS) 用户： 如果可以成功地使用 IPsec/L2TP 模式连接，但是你的公有 IP 没有显示为 `你的 VPN 服务器 IP`，请阅读上面的 [OS X](#os-x) 部分并完成以下步骤。保存 VPN 配置然后重新连接。 @@ -348,9 +346,9 @@ OS X (macOS) 用户： 如果可以成功地使用 IPsec/L2TP 模式连接，但 如果在尝试上面步骤之后，你的计算机仍然不能通过 VPN 连接发送通信，检查一下服务顺序。进入系统偏好设置中的网络部分，单击左侧连接列表下方的齿轮按钮，选择 "设定服务顺序"。然后将 VPN 连接拖动到顶端。 -### iOS 13 和 macOS 10.15/11 +### iOS 13+ 和 macOS 10.15/11+ -如果你的设备运行 iOS 13 或以上版本, macOS 10.15 (Catalina) 或者 macOS 11 (Big Sur)，并且无法连接到 VPN，请尝试以下步骤：编辑 VPN 服务器上的 `/etc/ipsec.conf`。找到 `sha2-truncbug=yes` 并将它替换为 `sha2-truncbug=no`。保存修改并运行 `service ipsec restart`。然后重新连接 VPN。 +如果你的设备运行 iOS 13+, macOS 10.15 (Catalina), macOS 11 (Big Sur) 或以上版本，并且无法连接到 VPN，请尝试以下步骤：编辑 VPN 服务器上的 `/etc/ipsec.conf`。找到 `sha2-truncbug=yes` 并将它替换为 `sha2-truncbug=no`。保存修改并运行 `service ipsec restart`。然后重新连接 VPN。 另外，macOS Big Sur 11.0 用户应该更新到版本 11.1 或以上，以修复 VPN 连接的某些问题。要检查 macOS 版本并安装更新，请看[这里](https://www.businessinsider.com/how-to-check-mac-os-version)。 diff --git a/docs/clients.md b/docs/clients.md index 099dd94..35cf3f5 100644 --- a/docs/clients.md +++ b/docs/clients.md @@ -228,7 +228,7 @@ First check [here](https://github.com/nm-l2tp/NetworkManager-l2tp/wiki/Prebuilt- * [Android MTU/MSS issues](#android-mtumss-issues) * [Android 6 and 7](#android-6-and-7) * [macOS send traffic over VPN](#macos-send-traffic-over-vpn) -* [iOS 13 and macOS 10.15/11](#ios-13-and-macos-101511) +* [iOS 13+ and macOS 10.15/11+](#ios-13-and-macos-101511) * [iOS/Android sleep mode](#iosandroid-sleep-mode) * [Debian 11/10 kernel](#debian-1110-kernel) * [Other errors](#other-errors) @@ -288,7 +288,7 @@ To fix these errors, please follow these steps: 1. Click **OK** to close the **Advanced settings**. 1. Click **OK** to save the VPN connection details. -![Select CHAP in VPN connection properties](images/vpn-properties.png) +For reference, see [this screenshot](images/vpn-properties.png) of the VPN connection properties dialog. ### Windows 10 connecting @@ -331,13 +331,11 @@ References: [[1]](https://wiki.strongswan.org/projects/strongswan/wiki/Forwardin If your Android 6.x or 7.x device cannot connect, try these steps: -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. 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 screenshot](images/vpn-profile-Android.png)), enable it and reconnect the VPN. If not, try the next step. 1. Edit `/etc/ipsec.conf` on the VPN server. Find the line `sha2-truncbug` and toggle its value. i.e. Replace `sha2-truncbug=no` with `sha2-truncbug=yes`, or replace `sha2-truncbug=yes` with `sha2-truncbug=no`. Save the file and run `service ipsec restart`. Then reconnect the VPN. **Docker users:** You may set `sha2-truncbug=yes` (default is `no`) in `/etc/ipsec.conf` by adding `VPN_SHA2_TRUNCBUG=yes` to [your env file](https://github.com/hwdsl2/docker-ipsec-vpn-server#how-to-use-this-image), then re-create the Docker container. -![Android VPN workaround](images/vpn-profile-Android.png) - ### macOS send traffic over VPN OS X (macOS) users: If you can successfully connect using IPsec/L2TP mode, but your public IP does not show `Your VPN Server IP`, read the [OS X](#os-x) section above and complete these steps. Save VPN configuration and re-connect. @@ -347,9 +345,9 @@ OS X (macOS) users: If you can successfully connect using IPsec/L2TP mode, but y After trying the steps above, if your computer is still not sending traffic over the VPN, check the service order. From the main network preferences screen, select "set service order" in the cog drop down under the list of connections. Drag the VPN connection to the top. -### iOS 13 and macOS 10.15/11 +### iOS 13+ and macOS 10.15/11+ -If your device running iOS 13 or above, macOS 10.15 (Catalina) or macOS 11 (Big Sur) cannot connect, 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`. Then reconnect the VPN. +If your device running iOS 13+, macOS 10.15 (Catalina), macOS 11 (Big Sur) or above cannot connect, 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`. Then reconnect the VPN. In addition, users running macOS Big Sur 11.0 should update to version 11.1 or newer, to fix some issues with VPN connections. To check your macOS version and update, refer to [this article](https://www.businessinsider.com/how-to-check-mac-os-version).