Skip to content

Commit 3fb024e

Browse files
committed
Update docs
1 parent 118ece6 commit 3fb024e

File tree

2 files changed

+24
-4
lines changed

2 files changed

+24
-4
lines changed

docs/ikev2-howto-zh.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,14 +499,23 @@ wget https://git.io/ikev2setup -O ikev2.sh && sudo bash ikev2.sh --auto
499499
500500
## 移除 IKEv2
501501
502-
如果你想要从 VPN 服务器移除 IKEv2,但是保留 [IPsec/L2TP](clients-zh.md) 和 [IPsec/XAuth ("Cisco IPsec")](clients-xauth-zh.md) 模式,按照以下步骤操作。这些命令必须用 `root` 账户运行。请注意,这将删除所有的 IKEv2 配置,并且**不可撤销**
502+
如果你想要从 VPN 服务器移除 IKEv2,但是保留 [IPsec/L2TP](clients-zh.md) 和 [IPsec/XAuth ("Cisco IPsec")](clients-xauth-zh.md) 模式,请重新运行 [辅助脚本](#使用辅助脚本) 并选择 "Remove IKEv2" 选项。请注意,这将删除所有的 IKEv2 配置(包括证书),并且**不可撤销**!
503+
504+
<details>
505+
<summary>
506+
另外,你也可以手动移除 IKEv2。点这里查看步骤。
507+
</summary>
508+
509+
要手动从 VPN 服务器移除 IKEv2,但是保留 [IPsec/L2TP](clients-zh.md) 和 [IPsec/XAuth ("Cisco IPsec")](clients-xauth-zh.md) 模式,按照以下步骤操作。这些命令必须用 `root` 账户运行。请注意,这将删除所有的 IKEv2 配置(包括证书),并且**不可撤销**
503510
504511
1. 重命名(或者删除)IKEv2 配置文件:
505512
506513
```bash
507514
mv /etc/ipsec.d/ikev2.conf /etc/ipsec.d/ikev2.conf.bak
508515
```
509516
517+
**注:** 如果你使用了较旧版本(2020-05-31 之前)的 IKEv2 辅助脚本或者配置说明,文件 `/etc/ipsec.d/ikev2.conf` 可能不存在。在该情况下,请移除文件 `/etc/ipsec.conf` 中的 `conn ikev2-cp` 部分。
518+
510519
1. **(重要)重启 IPsec 服务**
511520
512521
```bash
@@ -535,6 +544,7 @@ wget https://git.io/ikev2setup -O ikev2.sh && sudo bash ikev2.sh --auto
535544
```bash
536545
certutil -D -d sql:/etc/ipsec.d -n "Nickname"
537546
```
547+
</details>
538548
539549
## 参考链接
540550

docs/ikev2-howto.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ First, securely transfer the generated `.mobileconfig` file to your Mac, then do
8888

8989
<details>
9090
<summary>
91-
If you manually set up IKEv2 without using the helper script, click here to see instructions.
91+
If you manually set up IKEv2 without using the helper script, click here for instructions.
9292
</summary>
9393

9494
First, securely transfer the generated `.p12` file to your Mac, then double-click to import into the **login** keychain in **Keychain Access**. Next, double-click on the imported `IKEv2 VPN CA` certificate, expand **Trust** and select **Always Trust** from the **IP Security (IPsec)** drop-down menu. Close the dialog using the red "X" on the top-left corner. When prompted, use Touch ID or enter your password and click "Update Settings".
@@ -134,7 +134,7 @@ When finished, check to make sure "IKEv2 VPN configuration" is listed under Sett
134134

135135
<details>
136136
<summary>
137-
If you manually set up IKEv2 without using the helper script, click here to see instructions.
137+
If you manually set up IKEv2 without using the helper script, click here for instructions.
138138
</summary>
139139

140140
First, securely transfer the generated `ikev2vpnca.cer` and `.p12` files to your iOS device, then import them one by one as iOS profiles. To transfer the files, you may use:
@@ -499,14 +499,23 @@ Before continuing, you **must** restart the IPsec service. The IKEv2 setup on th
499499
500500
## Remove IKEv2
501501
502-
If you want to remove IKEv2 from the VPN server, but keep the [IPsec/L2TP](clients.md) and [IPsec/XAuth ("Cisco IPsec")](clients-xauth.md) modes, follow these steps. Commands must be run as `root`. Note that this will delete all IKEv2 configuration and **cannot be undone**!
502+
If you want to remove IKEv2 from the VPN server, but keep the [IPsec/L2TP](clients.md) and [IPsec/XAuth ("Cisco IPsec")](clients-xauth.md) modes, run the [helper script](#using-helper-scripts) again and select the "Remove IKEv2" option. Note that this will delete all IKEv2 configuration including certificates, and **cannot be undone**!
503+
504+
<details>
505+
<summary>
506+
Alternatively, you can manually remove IKEv2. Click here for instructions.
507+
</summary>
508+
509+
To manually remove IKEv2 from the VPN server, but keep the [IPsec/L2TP](clients.md) and [IPsec/XAuth ("Cisco IPsec")](clients-xauth.md) modes, follow these steps. Commands must be run as `root`. Note that this will delete all IKEv2 configuration including certificates, and **cannot be undone**!
503510
504511
1. Rename (or delete) the IKEv2 config file:
505512
506513
```bash
507514
mv /etc/ipsec.d/ikev2.conf /etc/ipsec.d/ikev2.conf.bak
508515
```
509516
517+
**Note:** If you used an older version (before 2020-05-31) of the IKEv2 helper script or instructions, file `/etc/ipsec.d/ikev2.conf` may not exist. In this case, please instead remove the `conn ikev2-cp` section from file `/etc/ipsec.conf`.
518+
510519
1. **(Important) Restart the IPsec service**:
511520
512521
```bash
@@ -535,6 +544,7 @@ If you want to remove IKEv2 from the VPN server, but keep the [IPsec/L2TP](clien
535544
```bash
536545
certutil -D -d sql:/etc/ipsec.d -n "Nickname"
537546
```
547+
</details>
538548
539549
## References
540550

0 commit comments

Comments
 (0)