From fec47196d660b4b6975114147cb6f3426f78b622 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Sun, 19 Mar 2017 22:10:49 -0500 Subject: [PATCH] Update docs --- README-zh.md | 2 +- README.md | 4 ++-- azure/README-zh.md | 2 +- azure/README.md | 2 +- docs/clients-xauth-zh.md | 2 +- docs/clients-xauth.md | 2 +- docs/clients-zh.md | 2 +- docs/clients.md | 2 +- docs/ikev2-howto-zh.md | 12 +++++++----- docs/ikev2-howto.md | 10 ++++++---- docs/manage-users-zh.md | 2 +- docs/manage-users.md | 2 +- docs/uninstall-zh.md | 2 +- docs/uninstall.md | 2 +- 14 files changed, 26 insertions(+), 22 deletions(-) diff --git a/README-zh.md b/README-zh.md index 406794d..1b304b0 100644 --- a/README-zh.md +++ b/README-zh.md @@ -1,4 +1,4 @@ -# IPsec VPN 服务器一键安装脚本 +# IPsec VPN 服务器一键安装脚本 [![Build Status](https://travis-ci.org/hwdsl2/setup-ipsec-vpn.svg?branch=master)](https://travis-ci.org/hwdsl2/setup-ipsec-vpn) [![GitHub Stars](https://img.shields.io/github/stars/hwdsl2/setup-ipsec-vpn.svg?maxAge=86400)](https://github.com/hwdsl2/setup-ipsec-vpn/stargazers) [![Docker Stars](https://img.shields.io/docker/stars/hwdsl2/ipsec-vpn-server.svg?maxAge=86400)](https://github.com/hwdsl2/docker-ipsec-vpn-server/blob/master/README-zh.md) [![Docker Pulls](https://img.shields.io/docker/pulls/hwdsl2/ipsec-vpn-server.svg?maxAge=86400)](https://github.com/hwdsl2/docker-ipsec-vpn-server/blob/master/README-zh.md) diff --git a/README.md b/README.md index aac9934..441841e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# IPsec VPN Server Auto Setup Scripts +# IPsec VPN Server Auto Setup Scripts [![Build Status](https://travis-ci.org/hwdsl2/setup-ipsec-vpn.svg?branch=master)](https://travis-ci.org/hwdsl2/setup-ipsec-vpn) [![GitHub Stars](https://img.shields.io/github/stars/hwdsl2/setup-ipsec-vpn.svg?maxAge=86400)](https://github.com/hwdsl2/setup-ipsec-vpn/stargazers) [![Docker Stars](https://img.shields.io/docker/stars/hwdsl2/ipsec-vpn-server.svg?maxAge=86400)](https://github.com/hwdsl2/docker-ipsec-vpn-server) [![Docker Pulls](https://img.shields.io/docker/pulls/hwdsl2/ipsec-vpn-server.svg?maxAge=86400)](https://github.com/hwdsl2/docker-ipsec-vpn-server) @@ -139,7 +139,7 @@ Enjoy your very own VPN! :sparkles::tada::rocket::sparkles: For **Windows users**, this one-time registry change is required if the VPN server and/or client is behind NAT (e.g. home router). -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. Also, your server must run [Libreswan 3.19](#upgrade-libreswan) or newer. +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. Also, your server must run [Libreswan 3.19](#upgrade-libreswan) or newer versions. For servers with an external firewall (e.g. EC2/GCE), open UDP ports 500 and 4500 for the VPN. diff --git a/azure/README-zh.md b/azure/README-zh.md index 53e3bf5..a1cf55f 100644 --- a/azure/README-zh.md +++ b/azure/README-zh.md @@ -1,4 +1,4 @@ -# 在 Microsoft Azure 上部署 +# 在 Microsoft Azure 上部署 *其他语言版本: [English](README.md), [简体中文](README-zh.md).* diff --git a/azure/README.md b/azure/README.md index 801f97d..697f219 100644 --- a/azure/README.md +++ b/azure/README.md @@ -1,4 +1,4 @@ -# Deploy to Microsoft Azure +# Deploy to Microsoft Azure *Read this in other languages: [English](README.md), [简体中文](README-zh.md).* diff --git a/docs/clients-xauth-zh.md b/docs/clients-xauth-zh.md index 7a98904..1a59fab 100644 --- a/docs/clients-xauth-zh.md +++ b/docs/clients-xauth-zh.md @@ -1,4 +1,4 @@ -# 配置 IPsec/XAuth VPN 客户端 +# 配置 IPsec/XAuth VPN 客户端 *其他语言版本: [English](clients-xauth.md), [简体中文](clients-xauth-zh.md).* diff --git a/docs/clients-xauth.md b/docs/clients-xauth.md index 874f4f3..601a8b8 100644 --- a/docs/clients-xauth.md +++ b/docs/clients-xauth.md @@ -1,4 +1,4 @@ -# Configure IPsec/XAuth VPN Clients +# Configure IPsec/XAuth VPN Clients *Read this in other languages: [English](clients-xauth.md), [简体中文](clients-xauth-zh.md).* diff --git a/docs/clients-zh.md b/docs/clients-zh.md index cf0a8d1..20d07aa 100644 --- a/docs/clients-zh.md +++ b/docs/clients-zh.md @@ -1,4 +1,4 @@ -# 配置 IPsec/L2TP VPN 客户端 +# 配置 IPsec/L2TP VPN 客户端 *其他语言版本: [English](clients.md), [简体中文](clients-zh.md).* diff --git a/docs/clients.md b/docs/clients.md index c733ddb..ff2f74d 100644 --- a/docs/clients.md +++ b/docs/clients.md @@ -1,4 +1,4 @@ -# Configure IPsec/L2TP VPN Clients +# Configure IPsec/L2TP VPN Clients *Read this in other languages: [English](clients.md), [简体中文](clients-zh.md).* diff --git a/docs/ikev2-howto-zh.md b/docs/ikev2-howto-zh.md index a1e16c3..d17f595 100644 --- a/docs/ikev2-howto-zh.md +++ b/docs/ikev2-howto-zh.md @@ -1,4 +1,4 @@ -# 如何配置 IKEv2 VPN: Windows 和 Android +# 如何配置 IKEv2 VPN: Windows 和 Android *其他语言版本: [English](ikev2-howto.md), [简体中文](ikev2-howto-zh.md).* @@ -152,7 +152,9 @@ Libreswan 支持通过使用 RSA 签名算法的 X.509 Machine Certificates 来 pk12util: PKCS12 EXPORT SUCCESSFUL ``` - 重复这个步骤来为更多的客户端生成证书，但必须把所有的 `vpnclient` 换成 `vpnclient2`，等等。请注意，如果你需要同时连接多个客户端，则必须为每个客户端生成唯一的证书。 + 重复这个步骤来为更多的客户端生成证书，但必须把所有的 `vpnclient` 换成 `vpnclient2`，等等。 + + **注：** 如果你需要同时连接多个客户端，则必须为每一个客户端生成唯一的证书。 1. 证书数据库现在应该包含以下内容： @@ -167,7 +169,7 @@ Libreswan 支持通过使用 RSA 签名算法的 X.509 Machine Certificates 来 vpnclient u,u,u ``` - **注：** 如需显示证书，可使用 `certutil -L -d sql:/etc/ipsec.d -n "Nickname"`。要删除证书，将 `-L` 换成 `-D`。更多的 `certutil` 使用说明请看 这里。 + **注：** 如需显示证书，可使用 `certutil -L -d sql:/etc/ipsec.d -n "Nickname"`。要删除一个证书，将 `-L` 换成 `-D`。更多的 `certutil` 使用说明请看 这里。 1. 重启 IPsec 服务： @@ -181,7 +183,7 @@ Libreswan 支持通过使用 RSA 签名算法的 X.509 Machine Certificates 来 1. 将 `.p12` 文件导入到 "计算机账户" 证书存储。在导入证书后，你必须确保将客户端证书放在 "个人 -> 证书" 目录中，并且将 CA 证书放在 "受信任的根证书颁发机构 -> 证书" 目录中。 - 请按照以下链接的步骤操作： + 详细的操作步骤： https://wiki.strongswan.org/projects/strongswan/wiki/Win7Certs 1. 在 Windows 计算机上添加一个新的 IKEv2 VPN 连接： @@ -200,7 +202,7 @@ Libreswan 支持通过使用 RSA 签名算法的 X.509 Machine Certificates 来 1. 在 **VPN Type** 下拉菜单选择 **IKEv2 Certificate**。 1. 单击添加一个 **User certificate**，然后单击 **Install**。 1. 选择你从服务器复制过来的 `.p12` 文件，并按提示操作。 - 1. 保存新的 VPN 连接，然后单击它开始连接。 + 1. 保存新的 VPN 连接，然后单击它以开始连接。 #### Windows Phone 8.1 及以上 diff --git a/docs/ikev2-howto.md b/docs/ikev2-howto.md index cf2bff1..4e49b7a 100644 --- a/docs/ikev2-howto.md +++ b/docs/ikev2-howto.md @@ -1,4 +1,4 @@ -# How-To: IKEv2 VPN for Windows and Android +# How-To: IKEv2 VPN for Windows and Android *Read this in other languages: [English](ikev2-howto.md), [简体中文](ikev2-howto-zh.md).* @@ -152,7 +152,9 @@ Before continuing, make sure you have successfully this page. + **Note:** To display a certificate, use `certutil -L -d sql:/etc/ipsec.d -n "Nickname"`. To delete a certificate, replace `-L` with `-D`. For other `certutil` usage, read this page. 1. Restart IPsec service: @@ -181,7 +183,7 @@ Before continuing, make sure you have successfully Certificates", and the CA cert is placed in "Trusted Root Certification Authorities -> Certificates". - Follow the instructions at this link: + Detailed instructions: https://wiki.strongswan.org/projects/strongswan/wiki/Win7Certs 1. On the Windows computer, add a new IKEv2 VPN connection： diff --git a/docs/manage-users-zh.md b/docs/manage-users-zh.md index b71ab34..6a19db0 100644 --- a/docs/manage-users-zh.md +++ b/docs/manage-users-zh.md @@ -1,4 +1,4 @@ -# 管理 VPN 用户 +# 管理 VPN 用户 *其他语言版本: [English](manage-users.md), [简体中文](manage-users-zh.md).* diff --git a/docs/manage-users.md b/docs/manage-users.md index daf2793..787a789 100644 --- a/docs/manage-users.md +++ b/docs/manage-users.md @@ -1,4 +1,4 @@ -# Manage VPN Users +# Manage VPN Users *Read this in other languages: [English](manage-users.md), [简体中文](manage-users-zh.md).* diff --git a/docs/uninstall-zh.md b/docs/uninstall-zh.md index 3164b82..6c85d8f 100644 --- a/docs/uninstall-zh.md +++ b/docs/uninstall-zh.md @@ -1,4 +1,4 @@ -# 卸载 VPN +# 卸载 VPN *其他语言版本: [English](uninstall.md), [简体中文](uninstall-zh.md).* diff --git a/docs/uninstall.md b/docs/uninstall.md index ec09d97..6037292 100644 --- a/docs/uninstall.md +++ b/docs/uninstall.md @@ -1,4 +1,4 @@ -# Uninstall the VPN +# Uninstall the VPN *Read this in other languages: [English](uninstall.md), [简体中文](uninstall-zh.md).*