Skip to content

Commit 1839943

Browse files
committed
Update docs
1 parent 9e6b26b commit 1839943

8 files changed

Lines changed: 12 additions & 12 deletions

File tree

README-zh.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ wget https://git.io/vpnsetup -O vpnsetup.sh && sudo sh vpnsetup.sh
7777

7878
<a href="https://blog.ls20.com/ipsec-l2tp-vpn-auto-setup-for-ubuntu-12-04-on-amazon-ec2/#gettingavps" target="_blank">**&raquo; 我想建立并使用自己的 VPN ,但是没有可用的服务器**</a>
7979

80-
高级用户可以在一个 $35 的 <a href="https://www.raspberrypi.org" target="_blank">Raspberry Pi</a> 上搭建 VPN 服务器。参见 <a href="https://blog.elasticbyte.net/setting-up-a-native-cisco-ipsec-vpn-server-using-a-raspberry-pi/" target="_blank">[1]</a> <a href="https://www.stewright.me/create-a-raspberry-pi-vpn-server-using-l2tpipsec/" target="_blank">[2]</a>。
80+
高级用户可以在一个 $35 的 <a href="https://www.raspberrypi.org" target="_blank">Raspberry Pi</a> 上搭建 VPN 服务器。参见 <a href="https://blog.elasticbyte.net/setting-up-a-native-cisco-ipsec-vpn-server-using-a-raspberry-pi/" target="_blank">[1]</a> <a href="https://www.stewright.me/2018/07/create-a-raspberry-pi-vpn-server-using-l2tpipsec/" target="_blank">[2]</a>。
8181

8282
<a name="debian-10-note"></a>
8383
\* Debian 10 用户需要使用标准的 Linux 内核(而不是 "cloud" 版本)。更多信息请看 <a href="docs/clients-zh.md#debian-10-内核" target="_blank">这里</a>。

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ This also includes Linux VMs in public clouds, such as <a href="https://blog.ls2
7777

7878
<a href="https://blog.ls20.com/ipsec-l2tp-vpn-auto-setup-for-ubuntu-12-04-on-amazon-ec2/#gettingavps" target="_blank">**&raquo; I want to run my own VPN but don't have a server for that**</a>
7979

80-
Advanced users can set up the VPN server on a $35 <a href="https://www.raspberrypi.org" target="_blank">Raspberry Pi</a>. See <a href="https://blog.elasticbyte.net/setting-up-a-native-cisco-ipsec-vpn-server-using-a-raspberry-pi/" target="_blank">[1]</a> <a href="https://www.stewright.me/create-a-raspberry-pi-vpn-server-using-l2tpipsec/" target="_blank">[2]</a>.
80+
Advanced users can set up the VPN server on a $35 <a href="https://www.raspberrypi.org" target="_blank">Raspberry Pi</a>. See <a href="https://blog.elasticbyte.net/setting-up-a-native-cisco-ipsec-vpn-server-using-a-raspberry-pi/" target="_blank">[1]</a> <a href="https://www.stewright.me/2018/07/create-a-raspberry-pi-vpn-server-using-l2tpipsec/" target="_blank">[2]</a>.
8181

8282
<a name="debian-10-note"></a>
8383
\* Debian 10 users should use the standard Linux kernel (not the "cloud" version). Read more <a href="docs/clients.md#debian-10-kernel" target="_blank">here</a>.

azure/README-zh.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
可根据偏好设置以下选项:
88

9-
- Username for VPN and SSH (用户名)
10-
- Password for VPN and SSH (密码)
9+
- Username for VPN **and** SSH (用户名)
10+
- Password for VPN **and** SSH (密码)
1111
- IPsec Pre-Shared Key for VPN (IPsec 预共享密钥)
1212
- Operating System Image (操作系统镜像,Debian 9 或 Ubuntu 18.04/16.04 LTS)
1313
- Virtual Machine Size (虚拟机大小,默认值: Standard_B1s)

azure/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ This template will create a fully working VPN server on the Microsoft Azure Clou
66

77
Customizable with the following options:
88

9-
- Username for VPN and SSH
10-
- Password for VPN and SSH
9+
- Username for VPN **and** SSH
10+
- Password for VPN **and** SSH
1111
- IPsec Pre-Shared Key for VPN
1212
- Operating System Image (Debian 9 or Ubuntu 18.04/16.04 LTS)
1313
- Virtual Machine Size (Default: Standard_B1s)

docs/clients-xauth-zh.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ VPN 连接成功后,会在通知栏显示图标。最后你可以到 <a href="
106106

107107
### Fedora 和 CentOS
108108

109-
Fedora 28 (和更新版本)和 CentOS 7 用户可以安装 <a href="https://apps.fedoraproject.org/packages/s/libreswan" target="_blank">NetworkManager-libreswan-gnome</a> 软件包,然后通过 GUI 配置 IPsec/XAuth VPN 客户端。
109+
Fedora 28 (和更新版本)和 CentOS 8/7 用户可以使用 `yum` 安装 `NetworkManager-libreswan-gnome` 软件包,然后通过 GUI 配置 IPsec/XAuth VPN 客户端。
110110

111111
1. 进入 Settings -> Network -> VPN。单击 **+** 按钮。
112112
1. 选择 **IPsec based VPN**

docs/clients-xauth.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ If you get an error when trying to connect, see <a href="clients.md#troubleshoot
106106

107107
### Fedora and CentOS
108108

109-
Fedora 28 (and newer) and CentOS 7 users can install the <a href="https://apps.fedoraproject.org/packages/s/libreswan" target="_blank">NetworkManager-libreswan-gnome</a> package, then configure the IPsec/XAuth VPN client using the GUI.
109+
Fedora 28 (and newer) and CentOS 8/7 users can install the `NetworkManager-libreswan-gnome` package using `yum`, then configure the IPsec/XAuth VPN client using the GUI.
110110

111111
1. Go to Settings -> Network -> VPN. Click the **+** button.
112112
1. Select **IPsec based VPN**.

docs/clients-zh.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ VPN 连接成功后,网络状态图标上会出现 VPN 指示。最后你可
167167

168168
### Ubuntu Linux
169169

170-
Ubuntu 18.04 (和更新版本)用户可以安装 <a href="https://packages.ubuntu.com/search?keywords=network-manager-l2tp-gnome" target="_blank">network-manager-l2tp-gnome</a> 软件包,然后通过 GUI 配置 IPsec/L2TP VPN 客户端。Ubuntu 16.04 用户可能需要添加 `nm-l2tp` PPA,参见 <a href="https://medium.com/@hkdb/ubuntu-16-04-connecting-to-l2tp-over-ipsec-via-network-manager-204b5d475721" target="_blank">这里</a>。
170+
Ubuntu 18.04 (和更新版本)用户可以使用 `apt` 安装 <a href="https://packages.ubuntu.com/search?keywords=network-manager-l2tp-gnome" target="_blank">network-manager-l2tp-gnome</a> 软件包,然后通过 GUI 配置 IPsec/L2TP VPN 客户端。Ubuntu 16.04 用户可能需要添加 `nm-l2tp` PPA,参见 <a href="https://medium.com/@hkdb/ubuntu-16-04-connecting-to-l2tp-over-ipsec-via-network-manager-204b5d475721" target="_blank">这里</a>。
171171

172172
1. 进入 Settings -> Network -> VPN。单击 **+** 按钮。
173173
1. 选择 **Layer 2 Tunneling Protocol (L2TP)**
@@ -193,7 +193,7 @@ VPN 连接成功后,你可以到 <a href="https://www.ipchicken.com" target="_
193193

194194
### Fedora 和 CentOS
195195

196-
Fedora 28 (和更新版本)和 CentOS 7 用户可以使用更高效的 [IPsec/XAuth](clients-xauth-zh.md#linux) 模式连接。
196+
Fedora 28 (和更新版本)和 CentOS 8/7 用户可以使用更高效的 [IPsec/XAuth](clients-xauth-zh.md#linux) 模式连接。
197197

198198
### 其它 Linux
199199

docs/clients.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ If you get an error when trying to connect, see <a href="#troubleshooting">Troub
167167

168168
### Ubuntu Linux
169169

170-
Ubuntu 18.04 (and newer) users can install the <a href="https://packages.ubuntu.com/search?keywords=network-manager-l2tp-gnome" target="_blank">network-manager-l2tp-gnome</a> package, then configure the IPsec/L2TP VPN client using the GUI. Ubuntu 16.04 users may need to add the `nm-l2tp` PPA, read more <a href="https://medium.com/@hkdb/ubuntu-16-04-connecting-to-l2tp-over-ipsec-via-network-manager-204b5d475721" target="_blank">here</a>.
170+
Ubuntu 18.04 (and newer) users can install the <a href="https://packages.ubuntu.com/search?keywords=network-manager-l2tp-gnome" target="_blank">network-manager-l2tp-gnome</a> package using `apt`, then configure the IPsec/L2TP VPN client using the GUI. Ubuntu 16.04 users may need to add the `nm-l2tp` PPA, read more <a href="https://medium.com/@hkdb/ubuntu-16-04-connecting-to-l2tp-over-ipsec-via-network-manager-204b5d475721" target="_blank">here</a>.
171171

172172
1. Go to Settings -> Network -> VPN. Click the **+** button.
173173
1. Select **Layer 2 Tunneling Protocol (L2TP)**.
@@ -193,7 +193,7 @@ If you get an error when trying to connect, try <a href="https://github.com/nm-l
193193

194194
### Fedora and CentOS
195195

196-
Fedora 28 (and newer) and CentOS 7 users can connect using the faster [IPsec/XAuth](clients-xauth.md#linux) mode.
196+
Fedora 28 (and newer) and CentOS 8/7 users can connect using the faster [IPsec/XAuth](clients-xauth.md#linux) mode.
197197

198198
### Other Linux
199199

0 commit comments

Comments
 (0)