Update docs
This commit is contained in:
hwdsl2
parent
5f75a7306a
commit
ccc93a8c96
@ -59,6 +59,8 @@ VPN 连接成功后，你会在 VPN Connect 状态窗口中看到 **tunnel enabl
|
||||
|
||||
要连接到 VPN： 使用菜单栏中的图标，或者打开系统偏好设置的网络部分，选择 VPN 并单击 **连接**。最后你可以到 <a href="https://www.ipchicken.com" target="_blank">这里</a> 检测你的 IP 地址，应该显示为`你的 VPN 服务器 IP`。
|
||||
|
||||
如果在连接过程中遇到错误，请参见 <a href="clients-zh.md#故障排除" target="_blank">故障排除</a>。
|
||||
|
||||
## Android
|
||||
|
||||
1. 启动 **设置** 应用程序。
|
||||
@ -97,6 +99,8 @@ VPN 连接成功后，会在通知栏显示图标。最后你可以到 <a href="
|
||||
|
||||
VPN 连接成功后，会在通知栏显示图标。最后你可以到 <a href="https://www.ipchicken.com" target="_blank">这里</a> 检测你的 IP 地址，应该显示为`你的 VPN 服务器 IP`。
|
||||
|
||||
如果在连接过程中遇到错误，请参见 <a href="clients-zh.md#故障排除" target="_blank">故障排除</a>。
|
||||
|
||||
## 致谢
|
||||
|
||||
本文档是在 <a href="https://github.com/StreisandEffect/streisand" target="_blank">Streisand</a> 项目文档基础上翻译和修改。该项目由 Joshua Lund 和其他开发者维护。
|
||||
|
||||
@ -59,6 +59,8 @@ If you get an error when trying to connect, see <a href="clients.md#troubleshoot
|
||||
|
||||
To connect to the VPN: Use the menu bar icon, or go to the Network section of System Preferences, select the VPN and choose **Connect**. You can verify that your traffic is being routed properly by <a href="https://www.google.com/search?q=my+ip" target="_blank">looking up your IP address on Google</a>. It should say "Your public IP address is `Your VPN Server IP`".
|
||||
|
||||
If you get an error when trying to connect, see <a href="clients.md#troubleshooting" target="_blank">Troubleshooting</a>.
|
||||
|
||||
## Android
|
||||
|
||||
1. Launch the **Settings** application.
|
||||
@ -97,6 +99,8 @@ If you get an error when trying to connect, see <a href="clients.md#troubleshoot
|
||||
|
||||
Once connected, you will see a VPN icon in the status bar. You can verify that your traffic is being routed properly by <a href="https://www.google.com/search?q=my+ip" target="_blank">looking up your IP address on Google</a>. It should say "Your public IP address is `Your VPN Server IP`".
|
||||
|
||||
If you get an error when trying to connect, see <a href="clients.md#troubleshooting" target="_blank">Troubleshooting</a>.
|
||||
|
||||
## Credits
|
||||
|
||||
This document was adapted from the <a href="https://github.com/StreisandEffect/streisand" target="_blank">Streisand</a> project, maintained by Joshua Lund and contributors.
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
* [故障排除](#故障排除)
|
||||
* [Windows 错误 809](#windows-错误-809)
|
||||
* [Windows 错误 628](#windows-错误-628)
|
||||
* [Windows 10 版本 1803](#windows-10-版本-1803)
|
||||
* [Windows 10 升级](#windows-10-升级)
|
||||
* [macOS VPN 流量](#macos-vpn-流量)
|
||||
* [Android 6 及以上版本](#android-6-及以上版本)
|
||||
* [Chromebook 连接问题](#chromebook-连接问题)
|
||||
@ -32,13 +32,13 @@
|
||||
### Windows 10 and 8.x
|
||||
|
||||
1. 右键单击系统托盘中的无线/网络图标。
|
||||
1. 选择 **打开网络与共享中心**。
|
||||
1. 选择 **打开网络和共享中心**。或者，如果你使用 Windows 10 版本 1709 或以上，选择 **打开"网络和 Internet"设置**，然后在打开的页面中单击 **网络和共享中心**。
|
||||
1. 单击 **设置新的连接或网络**。
|
||||
1. 选择 **连接到工作区**，然后单击 **下一步**。
|
||||
1. 单击 **使用我的Internet连接 (VPN)**。
|
||||
1. 在 **Internet地址** 字段中输入`你的 VPN 服务器 IP`。
|
||||
1. 在 **目标名称** 字段中输入任意内容。单击 **创建**。
|
||||
1. 返回 **网络与共享中心**。单击左侧的 **更改适配器设置**。
|
||||
1. 返回 **网络和共享中心**。单击左侧的 **更改适配器设置**。
|
||||
1. 右键单击新创建的 VPN 连接，并选择 **属性**。
|
||||
1. 单击 **安全** 选项卡，从 **VPN 类型** 下拉菜单中选择 "使用 IPsec 的第 2 层隧道协议 (L2TP/IPSec)"。
|
||||
1. 单击 **允许使用这些协议**。确保选中 "质询握手身份验证协议 (CHAP)" 复选框。
|
||||
@ -53,7 +53,7 @@
|
||||
|
||||
1. 单击开始菜单，选择控制面板。
|
||||
1. 进入 **网络和Internet** 部分。
|
||||
1. 单击 **网络与共享中心**。
|
||||
1. 单击 **网络和共享中心**。
|
||||
1. 单击 **设置新的连接或网络**。
|
||||
1. 选择 **连接到工作区**，然后单击 **下一步**。
|
||||
1. 单击 **使用我的Internet连接 (VPN)**。
|
||||
@ -65,7 +65,7 @@
|
||||
1. 在 **密码** 字段中输入`你的 VPN 密码`。
|
||||
1. 选中 **记住此密码** 复选框。
|
||||
1. 单击 **创建**，然后单击 **关闭** 按钮。
|
||||
1. 返回 **网络与共享中心**。单击左侧的 **更改适配器设置**。
|
||||
1. 返回 **网络和共享中心**。单击左侧的 **更改适配器设置**。
|
||||
1. 右键单击新创建的 VPN 连接，并选择 **属性**。
|
||||
1. 单击 **选项** 选项卡，取消选中 **包括Windows登录域** 复选框。
|
||||
1. 单击 **安全** 选项卡，从 **VPN 类型** 下拉菜单中选择 "使用 IPsec 的第 2 层隧道协议 (L2TP/IPSec)"。
|
||||
@ -104,6 +104,8 @@
|
||||
|
||||
要连接到 VPN： 使用菜单栏中的图标，或者打开系统偏好设置的网络部分，选择 VPN 并单击 **连接**。最后你可以到 <a href="https://www.ipchicken.com" target="_blank">这里</a> 检测你的 IP 地址，应该显示为`你的 VPN 服务器 IP`。
|
||||
|
||||
如果在连接过程中遇到错误，请参见 <a href="#故障排除">故障排除</a>。
|
||||
|
||||
## Android
|
||||
|
||||
**注：** 你也可以使用更高效的 [IPsec/XAuth 模式](clients-xauth-zh.md) 连接，或者配置 [IKEv2](ikev2-howto-zh.md)。
|
||||
@ -145,6 +147,8 @@ VPN 连接成功后，会在通知栏显示图标。最后你可以到 <a href="
|
||||
|
||||
VPN 连接成功后，会在通知栏显示图标。最后你可以到 <a href="https://www.ipchicken.com" target="_blank">这里</a> 检测你的 IP 地址，应该显示为`你的 VPN 服务器 IP`。
|
||||
|
||||
如果在连接过程中遇到错误，请参见 <a href="#故障排除">故障排除</a>。
|
||||
|
||||
## Chromebook
|
||||
|
||||
1. 如果你尚未登录 Chromebook，请先登录。
|
||||
@ -208,7 +212,7 @@ Windows Phone 8.1 及以上版本用户可以尝试按照 <a href="http://forums
|
||||
|
||||
要解决此错误，请按以下步骤操作：
|
||||
|
||||
1. 右键单击系统托盘中的无线/网络图标，选择 **打开网络与共享中心**。
|
||||
1. 右键单击系统托盘中的无线/网络图标，选择 **打开网络和共享中心**。
|
||||
1. 单击左侧的 **更改适配器设置**。右键单击新的 VPN 连接，并选择 **属性**。
|
||||
1. 单击 **安全** 选项卡，从 **VPN 类型** 下拉菜单中选择 "使用 IPsec 的第 2 层隧道协议 (L2TP/IPSec)"。
|
||||
1. 单击 **允许使用这些协议**。确保选中 "质询握手身份验证协议 (CHAP)" 复选框。
|
||||
@ -219,11 +223,9 @@ Windows Phone 8.1 及以上版本用户可以尝试按照 <a href="http://forums
|
||||
|
||||
|
||||
|
||||
### Windows 10 版本 1803
|
||||
### Windows 10 升级
|
||||
|
||||
如果你无法使用 Windows 10 版本 1803 或以上连接：编辑 VPN 服务器上的 `/etc/ipsec.conf`。找到 `sha2-truncbug=yes` 一行并将它替换为 `sha2-truncbug=no`。保存修改并运行 `service ipsec restart`。
|
||||
|
||||
另外，在升级 Windows 10 版本之后 （比如从 1709 到 1803），你可能需要重新按照 [Windows 错误 809](#windows-错误-809) 中的步骤修改注册表并重启。
|
||||
在升级 Windows 10 版本之后 （比如从 1709 到 1803），你可能需要重新按照上面的 [Windows 错误 809](#windows-错误-809) 中的步骤修改注册表并重启。
|
||||
|
||||
### macOS VPN 流量
|
||||
|
||||
@ -341,8 +343,8 @@ conn %default
|
||||
keyingtries=1
|
||||
keyexchange=ikev1
|
||||
authby=secret
|
||||
ike=aes128-sha1-modp1024,3des-sha1-modp1024!
|
||||
esp=aes128-sha1-modp1024,3des-sha1-modp1024!
|
||||
ike=aes256-sha1-modp2048,aes128-sha1-modp2048!
|
||||
esp=aes256-sha1-modp2048,aes128-sha1-modp2048!
|
||||
|
||||
conn myvpn
|
||||
keyexchange=ikev1
|
||||
|
||||
@ -18,7 +18,7 @@ After <a href="https://github.com/hwdsl2/setup-ipsec-vpn" target="_blank">settin
|
||||
* [Troubleshooting](#troubleshooting)
|
||||
* [Windows Error 809](#windows-error-809)
|
||||
* [Windows Error 628](#windows-error-628)
|
||||
* [Windows 10 version 1803](#windows-10-version-1803)
|
||||
* [Windows 10 upgrades](#windows-10-upgrades)
|
||||
* [macOS VPN traffic](#macos-vpn-traffic)
|
||||
* [Android 6 and above](#android-6-and-above)
|
||||
* [Chromebook issues](#chromebook-issues)
|
||||
@ -32,7 +32,7 @@ After <a href="https://github.com/hwdsl2/setup-ipsec-vpn" target="_blank">settin
|
||||
### Windows 10 and 8.x
|
||||
|
||||
1. Right-click on the wireless/network icon in your system tray.
|
||||
1. Select **Open Network and Sharing Center**.
|
||||
1. Select **Open Network and Sharing Center**. Or, if using Windows 10 version 1709 or newer, select **Open Network & Internet settings**, then on the page that opens, click **Network and Sharing Center**.
|
||||
1. Click **Set up a new connection or network**.
|
||||
1. Select **Connect to a workplace** and click **Next**.
|
||||
1. Click **Use my Internet connection (VPN)**.
|
||||
@ -41,7 +41,7 @@ After <a href="https://github.com/hwdsl2/setup-ipsec-vpn" target="_blank">settin
|
||||
1. Return to **Network and Sharing Center**. On the left, click **Change adapter settings**.
|
||||
1. Right-click on the new VPN entry and choose **Properties**.
|
||||
1. Click the **Security** tab. Select "Layer 2 Tunneling Protocol with IPsec (L2TP/IPSec)" for the **Type of VPN**.
|
||||
1. Click **Allow these protocols**. Be sure to select the "Challenge Handshake Authentication Protocol (CHAP)" checkbox.
|
||||
1. Click **Allow these protocols**. Make sure the "Challenge Handshake Authentication Protocol (CHAP)" checkbox is checked.
|
||||
1. Click the **Advanced settings** button.
|
||||
1. Select **Use preshared key for authentication** and enter `Your VPN IPsec PSK` for the **Key**.
|
||||
1. Click **OK** to close the **Advanced settings**.
|
||||
@ -69,7 +69,7 @@ After <a href="https://github.com/hwdsl2/setup-ipsec-vpn" target="_blank">settin
|
||||
1. Right-click on the new VPN entry and choose **Properties**.
|
||||
1. Click the **Options** tab and uncheck **Include Windows logon domain**.
|
||||
1. Click the **Security** tab. Select "Layer 2 Tunneling Protocol with IPsec (L2TP/IPSec)" for the **Type of VPN**.
|
||||
1. Click **Allow these protocols**. Be sure to select the "Challenge Handshake Authentication Protocol (CHAP)" checkbox.
|
||||
1. Click **Allow these protocols**. Make sure the "Challenge Handshake Authentication Protocol (CHAP)" checkbox is checked.
|
||||
1. Click the **Advanced settings** button.
|
||||
1. Select **Use preshared key for authentication** and enter `Your VPN IPsec PSK` for the **Key**.
|
||||
1. Click **OK** to close the **Advanced settings**.
|
||||
@ -104,6 +104,8 @@ If you get an error when trying to connect, see <a href="#troubleshooting">Troub
|
||||
|
||||
To connect to the VPN: Use the menu bar icon, or go to the Network section of System Preferences, select the VPN and choose **Connect**. You can verify that your traffic is being routed properly by <a href="https://www.google.com/search?q=my+ip" target="_blank">looking up your IP address on Google</a>. It should say "Your public IP address is `Your VPN Server IP`".
|
||||
|
||||
If you get an error when trying to connect, see <a href="#troubleshooting">Troubleshooting</a>.
|
||||
|
||||
## Android
|
||||
|
||||
**Note:** You may also connect using the faster [IPsec/XAuth mode](clients-xauth.md), or set up [IKEv2](ikev2-howto.md).
|
||||
@ -145,6 +147,8 @@ If you get an error when trying to connect, see <a href="#troubleshooting">Troub
|
||||
|
||||
Once connected, you will see a VPN icon in the status bar. You can verify that your traffic is being routed properly by <a href="https://www.google.com/search?q=my+ip" target="_blank">looking up your IP address on Google</a>. It should say "Your public IP address is `Your VPN Server IP`".
|
||||
|
||||
If you get an error when trying to connect, see <a href="#troubleshooting">Troubleshooting</a>.
|
||||
|
||||
## Chromebook
|
||||
|
||||
1. If you haven't already, sign in to your Chromebook.
|
||||
@ -211,7 +215,7 @@ To fix this error, please follow these steps:
|
||||
1. Right-click on the wireless/network icon in system tray, select **Open Network and Sharing Center**.
|
||||
1. On the left, click **Change adapter settings**. Right-click on the new VPN and choose **Properties**.
|
||||
1. Click the **Security** tab. Select "Layer 2 Tunneling Protocol with IPsec (L2TP/IPSec)" for **Type of VPN**.
|
||||
1. Click **Allow these protocols**. Be sure to select the "Challenge Handshake Authentication Protocol (CHAP)" checkbox.
|
||||
1. Click **Allow these protocols**. Make sure the "Challenge Handshake Authentication Protocol (CHAP)" checkbox is checked.
|
||||
1. Click the **Advanced settings** button.
|
||||
1. Select **Use preshared key for authentication** and enter `Your VPN IPsec PSK` for the **Key**.
|
||||
1. Click **OK** to close the **Advanced settings**.
|
||||
@ -219,11 +223,9 @@ To fix this error, please follow these steps:
|
||||
|
||||
|
||||
|
||||
### Windows 10 version 1803
|
||||
### Windows 10 upgrades
|
||||
|
||||
If you are unable to connect using Windows 10 version 1803 or above: Edit `/etc/ipsec.conf` on the VPN server. Find the line `sha2-truncbug=yes` and replace it with `sha2-truncbug=no`. Save the file and run `service ipsec restart`.
|
||||
|
||||
Also, after upgrading Windows 10 version (e.g. from 1709 to 1803), you may need to re-apply the fix for [Windows Error 809](#windows-error-809) and reboot.
|
||||
After upgrading Windows 10 version (e.g. from 1709 to 1803), you may need to re-apply the fix above for [Windows Error 809](#windows-error-809) and reboot.
|
||||
|
||||
### macOS VPN traffic
|
||||
|
||||
@ -341,8 +343,8 @@ conn %default
|
||||
keyingtries=1
|
||||
keyexchange=ikev1
|
||||
authby=secret
|
||||
ike=aes128-sha1-modp1024,3des-sha1-modp1024!
|
||||
esp=aes128-sha1-modp1024,3des-sha1-modp1024!
|
||||
ike=aes256-sha1-modp2048,aes128-sha1-modp2048!
|
||||
esp=aes256-sha1-modp2048,aes128-sha1-modp2048!
|
||||
|
||||
conn myvpn
|
||||
keyexchange=ikev1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user