diff --git a/README-zh.md b/README-zh.md index 99e8228..592bf44 100644 --- a/README-zh.md +++ b/README-zh.md @@ -8,8 +8,6 @@ IPsec VPN 可以加密你的网络流量,以防止在通过因特网传送时 我们将使用 [Libreswan](https://libreswan.org/) 作为 IPsec 服务器,以及 [xl2tpd](https://github.com/xelerance/xl2tpd) 作为 L2TP 提供者。 -[**» 另见:Docker 上的 IPsec VPN 服务器**](https://github.com/hwdsl2/docker-ipsec-vpn-server/blob/master/README-zh.md) - *其他语言版本: [English](README.md), [简体中文](README-zh.md).* #### 目录 @@ -25,7 +23,6 @@ IPsec VPN 可以加密你的网络流量,以防止在通过因特网传送时 - [高级用法](#高级用法) - [问题和反馈](#问题和反馈) - [卸载说明](#卸载说明) -- [另见](#另见) - [授权协议](#授权协议) ## 快速开始 @@ -372,10 +369,6 @@ wget https://git.io/vpnupgrade-amzn -O vpnup.sh && sudo sh vpnup.sh 请参见 [卸载 VPN](docs/uninstall-zh.md)。 -## 另见 - -- [IPsec VPN Server on Docker](https://github.com/hwdsl2/docker-ipsec-vpn-server/blob/master/README-zh.md) - ## 授权协议 版权所有 (C) 2014-2021 [Lin Song](https://github.com/hwdsl2) [![View my profile on LinkedIn](https://static.licdn.com/scds/common/u/img/webpromo/btn_viewmy_160x25.png)](https://www.linkedin.com/in/linsongui) diff --git a/README.md b/README.md index 6612af0..ae9c780 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,6 @@ An IPsec VPN encrypts your network traffic, so that nobody between you and the V We will use [Libreswan](https://libreswan.org/) as the IPsec server, and [xl2tpd](https://github.com/xelerance/xl2tpd) as the L2TP provider. -[**» See also: IPsec VPN Server on Docker**](https://github.com/hwdsl2/docker-ipsec-vpn-server) - *Read this in other languages: [English](README.md), [简体中文](README-zh.md).* #### Table of Contents @@ -25,7 +23,6 @@ We will use [Libreswan](https://libreswan.org/) as the IPsec server, and [xl2tpd - [Advanced usage](#advanced-usage) - [Bugs & Questions](#bugs--questions) - [Uninstallation](#uninstallation) -- [See also](#see-also) - [License](#license) ## Quick start @@ -372,10 +369,6 @@ See [Advanced usage](docs/advanced-usage.md). See [Uninstall the VPN](docs/uninstall.md). -## See also - -- [IPsec VPN Server on Docker](https://github.com/hwdsl2/docker-ipsec-vpn-server) - ## License Copyright (C) 2014-2021 [Lin Song](https://github.com/hwdsl2) [![View my profile on LinkedIn](https://static.licdn.com/scds/common/u/img/webpromo/btn_viewmy_160x25.png)](https://www.linkedin.com/in/linsongui) diff --git a/docs/ikev2-howto-zh.md b/docs/ikev2-howto-zh.md index b438ead..ba9468f 100644 --- a/docs/ikev2-howto-zh.md +++ b/docs/ikev2-howto-zh.md @@ -743,7 +743,7 @@ sudo ikev2.sh --exportclient [client name] ### 在导入时提示密码不正确 -如果你忘记了客户端配置文件的密码,可以查看相同目录下的文件 `vpnclient.p12.password`(如果存在)。或者你也可以重新 [导出 IKEv2 客户端的配置](#导出已有的客户端的配置)。 +如果你忘记了客户端配置文件的密码,可以重新 [导出 IKEv2 客户端的配置](#导出已有的客户端的配置)。 Ubuntu 18.04 用户在尝试将生成的 `.p12` 文件导入到 Windows 时可能会遇到错误 "输入的密码不正确"。这是由 `NSS` 中的一个问题导致的。更多信息请看 [这里](https://github.com/hwdsl2/setup-ipsec-vpn/issues/414#issuecomment-460495258)。在 2021-01-21 已更新 IKEv2 辅助脚本以自动应用以下解决方法。
diff --git a/docs/ikev2-howto.md b/docs/ikev2-howto.md index 1d74c57..bdab34b 100644 --- a/docs/ikev2-howto.md +++ b/docs/ikev2-howto.md @@ -745,7 +745,7 @@ Before continuing, you **must** restart the IPsec service. The IKEv2 setup on th ### Incorrect password when trying to import -If you forgot the password for client config files, check file `vpnclient.p12.password` in the same folder (if exists). Alternatively, you may [export configuration for the IKEv2 client](#export-configuration-for-an-existing-client) again. +If you forgot the password for client config files, you may [export configuration for the IKEv2 client](#export-configuration-for-an-existing-client) again. Ubuntu 18.04 users may encounter the error "The password you entered is incorrect" when trying to import the generated `.p12` file into Windows. This is due to a bug in `NSS`. Read more [here](https://github.com/hwdsl2/setup-ipsec-vpn/issues/414#issuecomment-460495258). As of 2021-01-21, the IKEv2 helper script was updated to automatically apply the workaround below.