Minor corrections to docs
This commit is contained in:
parent
65950c2bd7
commit
59a914ec6d
@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
## 功能特性
|
## 功能特性
|
||||||
|
|
||||||
- :tada: **NEW:** 新增支持更高效的 `IPsec/XAUTH ("Cisco IPsec")` 模式
|
- :tada: **NEW:** 新增支持更高效的 `IPsec/XAuth ("Cisco IPsec")` 模式
|
||||||
- 全自动的 IPsec/L2TP VPN 服务器配置,无需用户输入
|
- 全自动的 IPsec/L2TP VPN 服务器配置,无需用户输入
|
||||||
- 封装所有的 VPN 流量在 UDP 协议,不需要 ESP 协议支持
|
- 封装所有的 VPN 流量在 UDP 协议,不需要 ESP 协议支持
|
||||||
- 可直接作为 Amazon EC2 实例创建时的用户数据使用
|
- 可直接作为 Amazon EC2 实例创建时的用户数据使用
|
||||||
@ -99,7 +99,7 @@ sudo sh vpnsetup_centos.sh
|
|||||||
|
|
||||||
配置你的计算机或其它设备使用 VPN 。请参见: <a href="docs/clients-zh.md" target="_blank">配置 IPsec/L2TP VPN 客户端</a>。
|
配置你的计算机或其它设备使用 VPN 。请参见: <a href="docs/clients-zh.md" target="_blank">配置 IPsec/L2TP VPN 客户端</a>。
|
||||||
|
|
||||||
**NEW:** 新增支持更高效的 `IPsec/XAUTH ("Cisco IPsec")` 模式。请参考 <a href="docs/clients-xauth-zh.md" target="_blank">配置 IPsec/XAUTH VPN 客户端</a>。
|
**NEW:** 新增支持更高效的 `IPsec/XAuth ("Cisco IPsec")` 模式。请参考 <a href="docs/clients-xauth-zh.md" target="_blank">配置 IPsec/XAuth VPN 客户端</a>。
|
||||||
|
|
||||||
开始使用自己的专属 VPN ! :sparkles::tada::rocket::sparkles:
|
开始使用自己的专属 VPN ! :sparkles::tada::rocket::sparkles:
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ We will use <a href="https://libreswan.org/" target="_blank">Libreswan</a> as th
|
|||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
- :tada: **NEW:** The faster `IPsec/XAUTH ("Cisco IPsec")` mode is now supported
|
- :tada: **NEW:** The faster `IPsec/XAuth ("Cisco IPsec")` mode is now supported
|
||||||
- Fully automated IPsec/L2TP VPN server setup, no user input needed
|
- Fully automated IPsec/L2TP VPN server setup, no user input needed
|
||||||
- Encapsulates all VPN traffic in UDP - does not need ESP protocol
|
- Encapsulates all VPN traffic in UDP - does not need ESP protocol
|
||||||
- Can be directly used as "user-data" for a new Amazon EC2 instance
|
- Can be directly used as "user-data" for a new Amazon EC2 instance
|
||||||
@ -99,7 +99,7 @@ If unable to download via `wget`, you may alternatively open <a href="vpnsetup.s
|
|||||||
|
|
||||||
Get your computer or device to use the VPN. Please see: <a href="docs/clients.md" target="_blank">Configure IPsec/L2TP VPN Clients</a>.
|
Get your computer or device to use the VPN. Please see: <a href="docs/clients.md" target="_blank">Configure IPsec/L2TP VPN Clients</a>.
|
||||||
|
|
||||||
**NEW:** The faster `IPsec/XAUTH ("Cisco IPsec")` mode is now supported. See: <a href="docs/clients-xauth.md" target="_blank">Configure IPsec/XAUTH VPN Clients</a>.
|
**NEW:** The faster `IPsec/XAuth ("Cisco IPsec")` mode is now supported. See: <a href="docs/clients-xauth.md" target="_blank">Configure IPsec/XAuth VPN Clients</a>.
|
||||||
|
|
||||||
Enjoy your very own VPN! :sparkles::tada::rocket::sparkles:
|
Enjoy your very own VPN! :sparkles::tada::rocket::sparkles:
|
||||||
|
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
## 配置 IPsec/XAUTH VPN 客户端
|
## 配置 IPsec/XAuth VPN 客户端
|
||||||
|
|
||||||
*Read this in other languages: [English](clients-xauth.md), [简体中文](clients-xauth-zh.md).*
|
*Read this in other languages: [English](clients-xauth.md), [简体中文](clients-xauth-zh.md).*
|
||||||
|
|
||||||
*如需使用 IPsec/L2TP 模式连接,请参见: [配置 IPsec/L2TP VPN 客户端](clients-zh.md)*
|
*如需使用 IPsec/L2TP 模式连接,请参见: [配置 IPsec/L2TP VPN 客户端](clients-zh.md)*
|
||||||
|
|
||||||
在成功<a href="https://github.com/hwdsl2/setup-ipsec-vpn" target="_blank">搭建自己的VPN服务器</a>之后,你可以按照下面的步骤来配置你的设备。IPsec/XAUTH 在 Android, iOS 和 OS X 上均受支持,无需安装额外的软件。Windows 用户可以使用免费的 <a href="https://www.shrew.net/download/vpn" target="_blank">Shrew Soft 客户端</a>。如果无法连接,请首先检查是否输入了正确的用户名和密码。
|
在成功<a href="https://github.com/hwdsl2/setup-ipsec-vpn" target="_blank">搭建自己的VPN服务器</a>之后,你可以按照下面的步骤来配置你的设备。IPsec/XAuth 在 Android, iOS 和 OS X 上均受支持,无需安装额外的软件。Windows 用户可以使用免费的 <a href="https://www.shrew.net/download/vpn" target="_blank">Shrew Soft 客户端</a>。如果无法连接,请首先检查是否输入了正确的用户名和密码。
|
||||||
|
|
||||||
`IPsec/XAUTH` 模式也称为 `Cisco IPsec`。和 `IPsec/L2TP` 相比较,它通常能够更快速和更高效地传输数据。
|
`IPsec/XAuth` 模式也称为 `Cisco IPsec`。和 `IPsec/L2TP` 相比较,它通常能够更快速和更高效地传输数据。
|
||||||
|
|
||||||
---
|
---
|
||||||
* 平台名称
|
* 平台名称
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
## Configure IPsec/XAUTH VPN Clients
|
## Configure IPsec/XAuth VPN Clients
|
||||||
|
|
||||||
*Read this in other languages: [English](clients-xauth.md), [简体中文](clients-xauth-zh.md).*
|
*Read this in other languages: [English](clients-xauth.md), [简体中文](clients-xauth-zh.md).*
|
||||||
|
|
||||||
*To connect using IPsec/L2TP mode, see: [Configure IPsec/L2TP VPN Clients](clients.md)*
|
*To connect using IPsec/L2TP mode, see: [Configure IPsec/L2TP VPN Clients](clients.md)*
|
||||||
|
|
||||||
After <a href="https://github.com/hwdsl2/setup-ipsec-vpn" target="_blank">setting up your own VPN server</a>, follow these steps to configure your devices. IPsec/XAUTH is natively supported by Android, iOS and OS X. There is no additional software to install. Windows users can use the free <a href="https://www.shrew.net/download/vpn" target="_blank">Shrew Soft client</a>. In case you are unable to connect, first check to make sure the VPN credentials were entered correctly.
|
After <a href="https://github.com/hwdsl2/setup-ipsec-vpn" target="_blank">setting up your own VPN server</a>, follow these steps to configure your devices. IPsec/XAuth is natively supported by Android, iOS and OS X. There is no additional software to install. Windows users can use the free <a href="https://www.shrew.net/download/vpn" target="_blank">Shrew Soft client</a>. In case you are unable to connect, first check to make sure the VPN credentials were entered correctly.
|
||||||
|
|
||||||
`IPsec/XAUTH` mode is also called `Cisco IPsec`. Compared to `IPsec/L2TP`, it is generally faster with less overhead.
|
`IPsec/XAuth` mode is also called `Cisco IPsec`. Compared to `IPsec/L2TP`, it is generally faster with less overhead.
|
||||||
|
|
||||||
---
|
---
|
||||||
* Platforms
|
* Platforms
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
*Read this in other languages: [English](clients.md), [简体中文](clients-zh.md).*
|
*Read this in other languages: [English](clients.md), [简体中文](clients-zh.md).*
|
||||||
|
|
||||||
*如需使用 IPsec/XAUTH 模式连接,请参见: [配置 IPsec/XAUTH VPN 客户端](clients-xauth-zh.md)*
|
*如需使用 IPsec/XAuth 模式连接,请参见: [配置 IPsec/XAuth VPN 客户端](clients-xauth-zh.md)*
|
||||||
|
|
||||||
在成功<a href="https://github.com/hwdsl2/setup-ipsec-vpn" target="_blank">搭建自己的VPN服务器</a>之后,你可以按照下面的步骤来配置你的设备。IPsec/L2TP 在 Android, iOS, OS X 和 Windows 上均受支持,无需安装额外的软件。设置过程通常只需要几分钟。如果无法连接,请首先检查是否输入了正确的用户名和密码。
|
在成功<a href="https://github.com/hwdsl2/setup-ipsec-vpn" target="_blank">搭建自己的VPN服务器</a>之后,你可以按照下面的步骤来配置你的设备。IPsec/L2TP 在 Android, iOS, OS X 和 Windows 上均受支持,无需安装额外的软件。设置过程通常只需要几分钟。如果无法连接,请首先检查是否输入了正确的用户名和密码。
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
*Read this in other languages: [English](clients.md), [简体中文](clients-zh.md).*
|
*Read this in other languages: [English](clients.md), [简体中文](clients-zh.md).*
|
||||||
|
|
||||||
*To connect using IPsec/XAUTH mode, see: [Configure IPsec/XAUTH VPN Clients](clients-xauth.md)*
|
*To connect using IPsec/XAuth mode, see: [Configure IPsec/XAuth VPN Clients](clients-xauth.md)*
|
||||||
|
|
||||||
After <a href="https://github.com/hwdsl2/setup-ipsec-vpn" target="_blank">setting up your own VPN server</a>, 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.
|
After <a href="https://github.com/hwdsl2/setup-ipsec-vpn" target="_blank">setting up your own VPN server</a>, 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.
|
||||||
|
|
||||||
|
@ -22,5 +22,5 @@ EOF
|
|||||||
You can add more users, use one line for each user.
|
You can add more users, use one line for each user.
|
||||||
3. The characters \ and " within your username/password (if present)
|
3. The characters \ and " within your username/password (if present)
|
||||||
MUST be escaped as \\ and \", respectively.
|
MUST be escaped as \\ and \", respectively.
|
||||||
4. To create multiple VPN users for IPsec/XAUTH, add more lines to file
|
4. To create multiple VPN users for IPsec/XAuth, add more lines to file
|
||||||
"/etc/ipsec.d/passwd". Refer to the VPN script for correct format.
|
"/etc/ipsec.d/passwd". Refer to the VPN script for correct format.
|
||||||
|
Loading…
Reference in New Issue
Block a user