diff --git a/README-zh.md b/README-zh.md index ee2bb8e..591eee4 100644 --- a/README-zh.md +++ b/README-zh.md @@ -25,8 +25,8 @@ ## 功能特性 -- :new: 新增支持更高效的 `IPsec/XAuth ("Cisco IPsec")` 模式 -- :new: 现在可以下载 VPN 服务器的预构建 Docker 镜像 +- **NEW:** 新增支持更高效的 `IPsec/XAuth ("Cisco IPsec")` 模式 +- **NEW:** 现在可以下载 VPN 服务器的预构建 Docker 镜像 - 全自动的 IPsec VPN 服务器配置,无需用户输入 - 封装所有的 VPN 流量在 UDP 协议,不需要 ESP 协议支持 - 可直接作为 Amazon EC2 实例创建时的用户数据使用 @@ -66,7 +66,7 @@ wget https://git.io/vpnsetup -O vpnsetup.sh && sudo sh vpnsetup.sh ```bash wget https://git.io/vpnsetup -O vpnsetup.sh -nano -w vpnsetup.sh # 或者使用你喜欢的编辑器 +nano -w vpnsetup.sh [替换为你自己的值: YOUR_IPSEC_PSK, YOUR_USERNAME 和 YOUR_PASSWORD] sudo sh vpnsetup.sh ``` @@ -75,7 +75,7 @@ sudo sh vpnsetup.sh 首先,更新你的系统: 运行 `yum update` 并重启。这一步是可选的,但推荐。 -然后按照与上面相同的步骤,但是将 `https://git.io/vpnsetup` 换成 `https://git.io/vpnsetup-centos`。 +按照与上面相同的步骤,但是将 `https://git.io/vpnsetup` 换成 `https://git.io/vpnsetup-centos`。 注: 如果无法通过 `wget` 下载,你也可以打开 vpnsetup.sh (或者 vpnsetup_centos.sh),然后点击右方的 **`Raw`** 按钮。按快捷键 `Ctrl-A` 全选, `Ctrl-C` 复制,然后粘贴到你喜欢的编辑器。 @@ -90,7 +90,7 @@ sudo sh vpnsetup.sh ## 重要提示 -**Windows 用户** 在首次连接之前需要修改一次注册表,以解决 VPN 服务器和客户端与 NAT (比如家用路由器)的兼容问题。另外如果遇到 `错误 628`,请打开 VPN 连接属性的 "安全" 选项卡,并确保仅选中 "CHAP" 选项。 +**Windows 用户** 在首次连接之前需要修改一次注册表,以解决 VPN 服务器和客户端与 NAT (比如家用路由器)的兼容问题。另外如果遇到 `错误 628`,请打开 VPN 连接属性的 "安全" 选项卡,并确保仅选中 "CHAP" 选项。 **Android 6 (Marshmallow) 用户** 请参考此文档中的注释: 配置 IPsec/L2TP VPN 客户端。 diff --git a/README.md b/README.md index 0d0bf16..a44945d 100644 --- a/README.md +++ b/README.md @@ -25,8 +25,8 @@ We will use Libreswan as th ## Features -- :new: The faster `IPsec/XAuth ("Cisco IPsec")` mode is now supported -- :new: A pre-built Docker image of the VPN server is now available +- **NEW:** The faster `IPsec/XAuth ("Cisco IPsec")` mode is now supported +- **NEW:** A pre-built Docker image of the VPN server is now available - Fully automated IPsec VPN server setup, no user input needed - Encapsulates all VPN traffic in UDP - does not need ESP protocol - Can be directly used as "user-data" for a new Amazon EC2 instance @@ -66,7 +66,7 @@ wget https://git.io/vpnsetup -O vpnsetup.sh && sudo sh vpnsetup.sh ```bash wget https://git.io/vpnsetup -O vpnsetup.sh -nano -w vpnsetup.sh # or use your favorite editor +nano -w vpnsetup.sh [Replace with your own values: YOUR_IPSEC_PSK, YOUR_USERNAME and YOUR_PASSWORD] sudo sh vpnsetup.sh ``` @@ -75,7 +75,7 @@ sudo sh vpnsetup.sh First, update your system with `yum update` and reboot. This is optional, but recommended. -Then follow the same steps as above, but replace `https://git.io/vpnsetup` with `https://git.io/vpnsetup-centos`. +Follow the same steps as above, but replace `https://git.io/vpnsetup` with `https://git.io/vpnsetup-centos`. Note: If unable to download via `wget`, you may also open vpnsetup.sh (or vpnsetup_centos.sh) and click the **`Raw`** button. Press `Ctrl-A` to select all, `Ctrl-C` to copy, then paste into your favorite editor. @@ -90,7 +90,7 @@ Enjoy your very own VPN! :sparkles::tada::rocket::sparkles: ## Important Notes -For **Windows users**, a one-time registry change is required if the VPN server and/or client is behind NAT (e.g. home router). Also, if you see `Error 628`, open the "Security" tab of VPN connection properties and make sure only "CHAP" is selected. +For **Windows users**, a one-time registry change is required if the VPN server and/or client is behind NAT (e.g. home router). Also, if you see `Error 628`, open the "Security" tab of VPN connection properties and make sure only "CHAP" is selected. **Android 6 (Marshmallow) users**: Please see notes in Configure IPsec/L2TP VPN Clients.