From 8acee7ec39da11b41067e26ea86e83aee3401a31 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Sat, 16 Jul 2016 09:25:01 -0500 Subject: [PATCH] Update docs [ci skip] --- README-zh.md | 15 +++++++++++++-- README.md | 13 ++++++++++++- docs/clients-zh.md | 4 +++- docs/clients.md | 4 +++- 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/README-zh.md b/README-zh.md index 127e951..957a328 100644 --- a/README-zh.md +++ b/README-zh.md @@ -45,7 +45,9 @@ **-或者-** -一个专用服务器，或者任何基于 KVM/Xen 的虚拟专用服务器 (VPS)，全新安装以上操作系统之一。另外也可以使用 Debian 7 (Wheezy)，但是必须首先运行另一个脚本。 OpenVZ VPS 用户可尝试 Shadowsocks ( libev | rss ) 或者 OpenVPN。 +一个专用服务器或者虚拟专用服务器 (VPS)，全新安装以上操作系统之一。另外也可使用 Debian 7 (Wheezy)，但是必须首先运行另一个脚本。 OpenVZ VPS 不受支持，用户可以尝试使用 ShadowsocksR 或者 OpenVPN。 + +这也包括各种云计算服务中的 Linux 虚拟机，比如 Google Compute Engine, Amazon EC2, Microsoft Azure, IBM SoftLayer, VMware vCloud Air, Rackspace, DigitalOcean 和 Linode. **» 我想建立并使用自己的 VPN ，但是没有可用的服务器** @@ -85,6 +87,8 @@ VPN_USER='你的VPN用户名' \ VPN_PASSWORD='你的VPN密码' sh vpnsetup.sh ``` +如需在 DigitalOcean 上安装，可以参考这个分步指南，由 Tony Tran 编写。 + **注：** 如果无法通过 `wget` 下载，你也可以打开 vpnsetup.sh (或者 vpnsetup_centos.sh)，然后点击右方的 **`Raw`** 按钮。按快捷键 `Ctrl-A` 全选， `Ctrl-C` 复制，然后粘贴到你喜欢的编辑器。 ### CentOS & RHEL @@ -136,7 +140,14 @@ VPN_PASSWORD='你的VPN密码' sh vpnsetup.sh ## 另见 -- 在 Docker 上搭建 IPsec VPN +- IPsec VPN Server on Docker +- Streisand +- SoftEther VPN +- ShadowsocksR +- OpenVPN Install +- VPN Deploy Playbook +- Insta VPN +- One Key IKEv2 VPN ## 作者 diff --git a/README.md b/README.md index bca3446..faf20b5 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,9 @@ A newly created Amazon EC2 **-OR-** -A dedicated server or any KVM- or Xen-based Virtual Private Server (VPS), freshly installed with one of the above systems. Besides those, Debian 7 (Wheezy) can also be used with this workaround. OpenVZ VPS users should instead try OpenVPN. +A dedicated server or Virtual Private Server (VPS), freshly installed with one of the above OS. In addition, Debian 7 (Wheezy) can also be used with this workaround. OpenVZ VPS is not supported, users could instead try OpenVPN. + +This also includes Linux VMs in public clouds such as Google Compute Engine, Amazon EC2, Microsoft Azure, IBM SoftLayer, VMware vCloud Air, Rackspace, DigitalOcean and Linode. **» I want to run my own VPN but don't have a server for that** @@ -85,6 +87,8 @@ VPN_USER='your_vpn_username' \ VPN_PASSWORD='your_vpn_password' sh vpnsetup.sh ``` +For installation on DigitalOcean, check out this step-by-step guide by Tony Tran. + **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. ### CentOS & RHEL @@ -137,6 +141,13 @@ Please refer to Uninstall the VPNIPsec VPN Server on Docker +- Streisand +- SoftEther VPN +- ShadowsocksR +- OpenVPN Install +- VPN Deploy Playbook +- Insta VPN +- One Key IKEv2 VPN ## Author diff --git a/docs/clients-zh.md b/docs/clients-zh.md index 119ef96..bccba3a 100644 --- a/docs/clients-zh.md +++ b/docs/clients-zh.md @@ -2,10 +2,12 @@ *其他语言版本: [English](clients.md), [简体中文](clients-zh.md).* -*如需使用 IPsec/XAuth ("Cisco IPsec") 模式连接，请参见： [配置 IPsec/XAuth VPN 客户端](clients-xauth-zh.md)* +*如需使用 IPsec/XAuth 模式连接，请参见： [配置 IPsec/XAuth VPN 客户端](clients-xauth-zh.md)* 在成功搭建自己的 VPN 服务器之后，你可以按照下面的步骤来配置你的设备。IPsec/L2TP 在 Android, iOS, OS X 和 Windows 上均受支持，无需安装额外的软件。设置过程通常只需要几分钟。如果无法连接,请首先检查是否输入了正确的 VPN 登录凭证。 +你也可以参考另一个带图片的分步指南，由 Tony Tran 编写。 + --- * 平台名称 * [Windows](#windows) diff --git a/docs/clients.md b/docs/clients.md index 0fb5baf..03c5dea 100644 --- a/docs/clients.md +++ b/docs/clients.md @@ -2,10 +2,12 @@ *Read this in other languages: [English](clients.md), [简体中文](clients-zh.md).* -*To connect using IPsec/XAuth ("Cisco IPsec") mode, see: [Configure IPsec/XAuth VPN Clients](clients-xauth.md)* +*To connect using IPsec/XAuth mode, see: [Configure IPsec/XAuth VPN Clients](clients-xauth.md)* After setting up your own VPN server, follow these steps to configure your devices. IPsec/L2TP is natively supported by Android, iOS, OS X, and Windows. There is no additional software to install. Setup should only take a few minutes. In case you are unable to connect, first check to make sure the VPN credentials were entered correctly. +An alternative step-by-step guide with images is available, written by Tony Tran. + --- * Platforms * [Windows](#windows)