From 6255c43e93facdd41d72783fa61dc76b2d0cb60c Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Wed, 21 Jun 2017 11:24:02 -0500 Subject: [PATCH] Update docs --- README-zh.md | 8 ++++---- README.md | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README-zh.md b/README-zh.md index 7c9858c..d1545ac 100644 --- a/README-zh.md +++ b/README-zh.md @@ -28,7 +28,7 @@ IPsec VPN 可以加密你的网络流量，以防止在通过因特网传送时 ## 快速开始 -首先，在你的 Linux 服务器* 上全新安装一个 Ubuntu LTS, Debian 8 或者 CentOS 7/6 系统。 +首先，在你的 Linux 服务器* 上全新安装一个 Ubuntu LTS, Debian 或者 CentOS 系统。 使用以下命令快速搭建 IPsec VPN 服务器： @@ -52,13 +52,13 @@ wget https://git.io/vpnsetup -O vpnsetup.sh && sudo sh vpnsetup.sh - 封装所有的 VPN 流量在 UDP 协议，不需要 ESP 协议支持 - 可直接作为 Amazon EC2 实例创建时的用户数据使用 - 包含 `sysctl.conf` 优化设置，以达到更佳的传输性能 -- 测试通过： Ubuntu 16.04/14.04/12.04， Debian 8 和 CentOS 7/6 +- 已测试： Ubuntu 16.04/14.04/12.04， Debian 9/8 和 CentOS 7/6 ## 系统要求 -一个新创建的 Amazon EC2 实例，使用这些映像 (AMI): +一个新创建的 Amazon EC2 实例，使用这些映像 (AMIs): - Ubuntu 16.04 (Xenial), 14.04 (Trusty) or 12.04 (Precise) -- Debian 8 (Jessie) EC2 Images +- Debian 9 (Stretch) or 8 (Jessie) - CentOS 7 (x86_64) with Updates - CentOS 6 (x86_64) with Updates diff --git a/README.md b/README.md index 3fabc70..3d06f53 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ We will use Libreswan as th ## Quick start -First, prepare your Linux server* with a fresh install of Ubuntu LTS, Debian 8 or CentOS 7/6. +First, prepare your Linux server* with a fresh install of Ubuntu LTS, Debian or CentOS. Use this one-liner to set up an IPsec VPN server: @@ -42,7 +42,7 @@ Your VPN login details will be randomly generated, and displayed on the screen w For other installation options and how to set up VPN clients, read the sections below. -\* A dedicated server or Virtual Private Server (VPS). OpenVZ VPS is NOT supported. +\* A dedicated server or virtual private server (VPS). OpenVZ VPS is not supported. ## Features @@ -52,13 +52,13 @@ For other installation options and how to set up VPN clients, read the sections - Encapsulates all VPN traffic in UDP - does not need ESP protocol - Can be directly used as "user-data" for a new Amazon EC2 instance - Includes `sysctl.conf` optimizations for improved performance -- Tested with Ubuntu 16.04/14.04/12.04, Debian 8 and CentOS 7/6 +- Tested with Ubuntu 16.04/14.04/12.04, Debian 9/8 and CentOS 7/6 ## Requirements -A newly created Amazon EC2 instance, from these images (AMI): +A newly created Amazon EC2 instance, from these images (AMIs): - Ubuntu 16.04 (Xenial), 14.04 (Trusty) or 12.04 (Precise) -- Debian 8 (Jessie) EC2 Images +- Debian 9 (Stretch) or 8 (Jessie) - CentOS 7 (x86_64) with Updates - CentOS 6 (x86_64) with Updates @@ -66,7 +66,7 @@ Please see this workaround. OpenVZ VPS is NOT supported, users could 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 DigitalOcean, Vultr, Linode, Google Compute Engine, Amazon Lightsail, Microsoft Azure, IBM SoftLayer, OVH and Rackspace.