From 894e6ccf414f010068d44cb2bf63fce69d54b366 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Thu, 31 Jan 2019 13:54:08 -0600 Subject: [PATCH] Update docs --- docs/clients-xauth-zh.md | 28 ++++++++++++++++++++++++++++ docs/clients-xauth.md | 28 ++++++++++++++++++++++++++++ docs/clients-zh.md | 19 +------------------ docs/clients.md | 19 +------------------ docs/manage-users-zh.md | 2 +- docs/manage-users.md | 2 +- 6 files changed, 60 insertions(+), 38 deletions(-) diff --git a/docs/clients-xauth-zh.md b/docs/clients-xauth-zh.md index 10a1573..29e03d0 100644 --- a/docs/clients-xauth-zh.md +++ b/docs/clients-xauth-zh.md @@ -14,6 +14,7 @@ IPsec/XAuth 模式也称为 "Cisco IPsec"。该模式通常能够比 IPsec/L2TP * [OS X (macOS)](#os-x) * [Android](#android) * [iOS (iPhone/iPad)](#ios) + * [Linux](#linux) ## Windows @@ -101,6 +102,33 @@ VPN 连接成功后，会在通知栏显示图标。最后你可以到 故障排除。 +## Linux + +### Fedora 和 CentOS + +Fedora 28 （和更新版本）和 CentOS 7 用户可以安装 NetworkManager-libreswan-gnome 软件包，然后通过 GUI 配置 IPsec/XAuth VPN 客户端。 + +1. 进入 Settings -> Network -> VPN。单击 **+** 按钮。 +1. 选择 **IPsec based VPN**。 +1. 在 **Name** 字段中输入任意内容。 +1. 在 **Gateway** 字段中输入`你的 VPN 服务器 IP`。 +1. 在 **Type** 下拉菜单选择 **IKEv1 (XAUTH)**。 +1. 在 **User name** 字段中输入`你的 VPN 用户名`。 +1. 右键单击 **User password** 字段中的 **?**，选择 **Store the password only for this user**。 +1. 在 **User password** 字段中输入`你的 VPN 密码`。 +1. 保持 **Group name** 字段空白。 +1. 右键单击 **Secret** 字段中的 **?**，选择 **Store the password only for this user**。 +1. 在 **Secret** 字段中输入`你的 VPN IPsec PSK`。 +1. 保持 **Remote ID** 字段空白。 +1. 单击 **Add** 保存 VPN 连接信息。 +1. 启用 **VPN** 连接。 + +VPN 连接成功后，你可以到 这里 检测你的 IP 地址，应该显示为`你的 VPN 服务器 IP`。 + +### 其它 Linux + +其它 Linux 版本用户可以使用 [IPsec/L2TP 模式](clients-zh.md#linux) 连接。 + ## 致谢 本文档是在 Streisand 项目文档基础上翻译和修改。该项目由 Joshua Lund 和其他开发者维护。 diff --git a/docs/clients-xauth.md b/docs/clients-xauth.md index 45a26d0..92d8ca7 100644 --- a/docs/clients-xauth.md +++ b/docs/clients-xauth.md @@ -14,6 +14,7 @@ IPsec/XAuth mode is also called "Cisco IPsec". This mode is generally **faster t * [OS X (macOS)](#os-x) * [Android](#android) * [iOS (iPhone/iPad)](#ios) + * [Linux](#linux) ## Windows @@ -101,6 +102,33 @@ Once connected, you will see a VPN icon in the status bar. You can verify that y If you get an error when trying to connect, see Troubleshooting. +## Linux + +### Fedora and CentOS + +Fedora 28 (and newer) and CentOS 7 users can install the NetworkManager-libreswan-gnome package, then configure the IPsec/XAuth VPN client using the GUI. + +1. Go to Settings -> Network -> VPN. Click the **+** button. +1. Select **IPsec based VPN**. +1. Enter anything you like in the **Name** field. +1. Enter `Your VPN Server IP` for the **Gateway**. +1. Select **IKEv1 (XAUTH)** in the **Type** drop-down menu. +1. Enter `Your VPN Username` for the **User name**. +1. Right-click the **?** in the **User password** field, select **Store the password only for this user**. +1. Enter `Your VPN Password` for the **User password**. +1. Leave the **Group name** field blank. +1. Right-click the **?** in the **Secret** field, select **Store the password only for this user**. +1. Enter `Your VPN IPsec PSK` for the **Secret**. +1. Leave the **Remote ID** field blank. +1. Click **Add** to save the VPN connection information. +1. Turn the **VPN** switch ON. + +Once connected, you can verify that your traffic is being routed properly by looking up your IP address on Google. It should say "Your public IP address is `Your VPN Server IP`". + +### Other Linux + +Other Linux users can connect using [IPsec/L2TP mode](clients.md#linux). + ## Credits This document was adapted from the Streisand project, maintained by Joshua Lund and contributors. diff --git a/docs/clients-zh.md b/docs/clients-zh.md index d17bcd6..e211461 100644 --- a/docs/clients-zh.md +++ b/docs/clients-zh.md @@ -189,24 +189,7 @@ VPN 连接成功后，你可以到 NetworkManager-libreswan-gnome 软件包，然后通过 GUI 配置 IPsec/L2TP VPN 客户端。 - -1. 进入 Settings -> Network -> VPN。单击 **+** 按钮。 -1. 选择 **IPsec based VPN**。 -1. 在 **Name** 字段中输入任意内容。 -1. 在 **Gateway** 字段中输入`你的 VPN 服务器 IP`。 -1. 在 **Type** 下拉菜单选择 **IKEv1 (XAUTH)**。 -1. 在 **User name** 字段中输入`你的 VPN 用户名`。 -1. 右键单击 **User password** 字段中的 **?**，选择 **Store the password only for this user**。 -1. 在 **User password** 字段中输入`你的 VPN 密码`。 -1. 保持 **Group name** 字段空白。 -1. 右键单击 **Secret** 字段中的 **?**，选择 **Store the password only for this user**。 -1. 在 **Secret** 字段中输入`你的 VPN IPsec PSK`。 -1. 保持 **Remote ID** 字段空白。 -1. 单击 **Add** 保存 VPN 连接信息。 -1. 启用 **VPN** 连接。 - -VPN 连接成功后，你可以到 这里 检测你的 IP 地址，应该显示为`你的 VPN 服务器 IP`。 +Fedora 28 （和更新版本）和 CentOS 7 用户可以使用更高效的 [IPsec/XAuth 模式](clients-xauth-zh.md#fedora-和-centos) 连接。 ### 其它 Linux diff --git a/docs/clients.md b/docs/clients.md index b1765ba..c9ad15d 100644 --- a/docs/clients.md +++ b/docs/clients.md @@ -189,24 +189,7 @@ Once connected, you can verify that your traffic is being routed properly by NetworkManager-libreswan-gnome package, then configure the IPsec/L2TP VPN client using the GUI. - -1. Go to Settings -> Network -> VPN. Click the **+** button. -1. Select **IPsec based VPN**. -1. Enter anything you like in the **Name** field. -1. Enter `Your VPN Server IP` for the **Gateway**. -1. Select **IKEv1 (XAUTH)** in the **Type** drop-down menu. -1. Enter `Your VPN Username` for the **User name**. -1. Right-click the **?** in the **User password** field, select **Store the password only for this user**. -1. Enter `Your VPN Password` for the **User password**. -1. Leave the **Group name** field blank. -1. Right-click the **?** in the **Secret** field, select **Store the password only for this user**. -1. Enter `Your VPN IPsec PSK` for the **Secret**. -1. Leave the **Remote ID** field blank. -1. Click **Add** to save the VPN connection information. -1. Turn the **VPN** switch ON. - -Once connected, you can verify that your traffic is being routed properly by looking up your IP address on Google. It should say "Your public IP address is `Your VPN Server IP`". +Fedora 28 (and newer) and CentOS 7 users can connect using the faster [IPsec/XAuth mode](clients-xauth.md#fedora-and-centos). ### Other Linux diff --git a/docs/manage-users-zh.md b/docs/manage-users-zh.md index 3a8c406..776da0b 100644 --- a/docs/manage-users-zh.md +++ b/docs/manage-users-zh.md @@ -6,7 +6,7 @@ ## 使用辅助脚本 -你可以使用这些脚本来更方便地管理 VPN 用户：[add_vpn_user.sh](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/extras/add_vpn_user.sh), [del_vpn_user.sh](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/extras/del_vpn_user.sh) 和 [update_vpn_users.sh](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/extras/update_vpn_users.sh)。它们将同时更新 IPsec/L2TP 和 IPsec/XAuth (Cisco IPsec) 模式的用户。如果你需要更改 IPsec PSK，请阅读下一节。 +你可以使用这些脚本来更方便地管理 VPN 用户：[add_vpn_user.sh](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/extras/add_vpn_user.sh), [del_vpn_user.sh](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/extras/del_vpn_user.sh) 和 [update_vpn_users.sh](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/extras/update_vpn_users.sh)。它们将同时更新 IPsec/L2TP 和 IPsec/XAuth ("Cisco IPsec") 模式的用户。如果你需要更改 IPsec PSK，请阅读下一节。 **注：** VPN 用户信息保存在文件 `/etc/ppp/chap-secrets` 和 `/etc/ipsec.d/passwd`。脚本在修改这些文件之前会先做备份，使用 `.old-日期-时间` 为后缀。 diff --git a/docs/manage-users.md b/docs/manage-users.md index 52f6e0a..091e2d2 100644 --- a/docs/manage-users.md +++ b/docs/manage-users.md @@ -6,7 +6,7 @@ By default, a single user account for VPN login is created. If you wish to add, ## Using helper scripts -You may use these scripts to more easily manage VPN users: [add_vpn_user.sh](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/extras/add_vpn_user.sh), [del_vpn_user.sh](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/extras/del_vpn_user.sh) and [update_vpn_users.sh](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/extras/update_vpn_users.sh). They will update users for both IPsec/L2TP and IPsec/XAuth (Cisco IPsec). For changing the IPsec PSK, read the next section. +You may use these scripts to more easily manage VPN users: [add_vpn_user.sh](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/extras/add_vpn_user.sh), [del_vpn_user.sh](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/extras/del_vpn_user.sh) and [update_vpn_users.sh](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/extras/update_vpn_users.sh). They will update users for both IPsec/L2TP and IPsec/XAuth ("Cisco IPsec"). For changing the IPsec PSK, read the next section. **Note:** VPN users are stored in `/etc/ppp/chap-secrets` and `/etc/ipsec.d/passwd`. The scripts will backup these files before making changes, with `.old-date-time` suffix.