From 5d3f4eb7e657841cbcfbb9998009cfcac3dbd1cf Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Fri, 21 Sep 2018 23:56:16 -0500
Subject: [PATCH] Update docs
- Update README and IKEv2 docs for Libreswan 3.26
---
README-zh.md | 2 --
README.md | 2 --
docs/ikev2-howto-zh.md | 18 +++++++++---------
docs/ikev2-howto.md | 18 +++++++++---------
4 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/README-zh.md b/README-zh.md
index a3a9bdd..f824a36 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -168,8 +168,6 @@ wget https://git.io/vpnupgrade -O vpnupgrade.sh
wget https://git.io/vpnupgrade-centos -O vpnupgrade.sh
```
-:warning: VPN 脚本默认安装 Libreswan 3.22，因为新版本 3.23 和 3.25 存在问题，从而不能同时连接在同一个 NAT （比如家用路由器）后面的多个 IPsec/XAuth VPN 客户端。
-
## 问题和反馈
- 有问题需要提问？请先搜索已有的留言，在 <a href="https://gist.github.com/hwdsl2/9030462#comments" target="_blank">这个 Gist</a> 以及 <a href="https://blog.ls20.com/ipsec-l2tp-vpn-auto-setup-for-ubuntu-12-04-on-amazon-ec2/#disqus_thread" target="_blank">我的博客</a>。
diff --git a/README.md b/README.md
index 8c37b71..c8b14ac 100644
--- a/README.md
+++ b/README.md
@@ -168,8 +168,6 @@ wget https://git.io/vpnupgrade -O vpnupgrade.sh
wget https://git.io/vpnupgrade-centos -O vpnupgrade.sh
```
-:warning: The VPN scripts install Libreswan 3.22 by default, because newer versions 3.23 and 3.25 have issues with connecting multiple IPsec/XAuth VPN clients from behind the same NAT (e.g. home router).
-
## Bugs & Questions
- Got a question? Please first search other people's comments <a href="https://gist.github.com/hwdsl2/9030462#comments" target="_blank">in this Gist</a> and <a href="https://blog.ls20.com/ipsec-l2tp-vpn-auto-setup-for-ubuntu-12-04-on-amazon-ec2/#disqus_thread" target="_blank">on my blog</a>.
diff --git a/docs/ikev2-howto-zh.md b/docs/ikev2-howto-zh.md
index 1830045..2635661 100644
--- a/docs/ikev2-howto-zh.md
+++ b/docs/ikev2-howto-zh.md
@@ -60,6 +60,15 @@ Libreswan 支持通过使用 RSA 签名算法的 X.509 Machine Certificates 来
$ ipsec --version
```
+ 如果是 Libreswan 3.23 或更新版本：
+
+ ```bash
+ $ cat >> /etc/ipsec.conf <<EOF
+ modecfgdns="8.8.8.8, 8.8.4.4"
+ encapsulation=yes
+ EOF
+ ```
+
如果是 Libreswan 3.19-3.22：
```bash
@@ -70,15 +79,6 @@ Libreswan 支持通过使用 RSA 签名算法的 X.509 Machine Certificates 来
EOF
```
- 如果是 Libreswan 3.23 或更新版本：
-
- ```bash
- $ cat >> /etc/ipsec.conf <<EOF
- modecfgdns="8.8.8.8, 8.8.4.4"
- encapsulation=yes
- EOF
- ```
-
如果是 Libreswan 3.18 或更早版本：
```bash
diff --git a/docs/ikev2-howto.md b/docs/ikev2-howto.md
index 70206d5..5cbe306 100644
--- a/docs/ikev2-howto.md
+++ b/docs/ikev2-howto.md
@@ -60,6 +60,15 @@ Before continuing, make sure you have successfully <a href="https://github.com/h
$ ipsec --version
```
+ For Libreswan 3.23 and newer:
+
+ ```bash
+ $ cat >> /etc/ipsec.conf <<EOF
+ modecfgdns="8.8.8.8, 8.8.4.4"
+ encapsulation=yes
+ EOF
+ ```
+
For Libreswan 3.19-3.22:
```bash
@@ -70,15 +79,6 @@ Before continuing, make sure you have successfully <a href="https://github.com/h
EOF
```
- For Libreswan 3.23 and newer:
-
- ```bash
- $ cat >> /etc/ipsec.conf <<EOF
- modecfgdns="8.8.8.8, 8.8.4.4"
- encapsulation=yes
- EOF
- ```
-
For Libreswan 3.18 and older:
```bash