Update docs

[ci skip]
This commit is contained in:
hwdsl2 2017-01-07 23:32:58 -06:00
parent efeff51f3a
commit c23d5c972a
2 changed files with 39 additions and 1 deletions

View File

@ -14,6 +14,7 @@ IPsec VPN 可以加密你的网络流量,以防止在通过因特网传送时
#### 目录
- [快速开始](#快速开始)
- [功能特性](#功能特性)
- [系统要求](#系统要求)
- [安装说明](#安装说明)
@ -25,6 +26,24 @@ IPsec VPN 可以加密你的网络流量,以防止在通过因特网传送时
- [另见](#另见)
- [授权协议](#授权协议)
## 快速开始
首先,在你的 Linux 服务器* 上全新安装一个 Ubuntu LTSDebian 8 或者 CentOS 7/6 系统。
使用以下命令快速搭建 IPsec VPN 服务器:
```bash
wget https://git.io/vpnsetup -O vpnsetup.sh && sudo sh vpnsetup.sh
```
对于 CentOS 系统,将上面的 `https://git.io/vpnsetup` 换成 `https://git.io/vpnsetup-centos`
你的 VPN 登录凭证将会被自动随机生成,并在安装完成后在屏幕上显示。
如需了解其它安装选项,以及如何配置 VPN 客户端,请阅读以下部分。
\* 一个专用服务器或者虚拟专用服务器 (VPS)。OpenVZ VPS 不受支持。
## 功能特性
- **新:** 增加支持更高效的 `IPsec/XAuth ("Cisco IPsec")` 模式

View File

@ -14,6 +14,7 @@ We will use <a href="https://libreswan.org/" target="_blank">Libreswan</a> as th
#### Table of Contents
- [Quick start](#quick-start)
- [Features](#features)
- [Requirements](#requirements)
- [Installation](#installation)
@ -25,6 +26,24 @@ We will use <a href="https://libreswan.org/" target="_blank">Libreswan</a> as th
- [See also](#see-also)
- [License](#license)
## Quick start
First, prepare your Linux server* with a fresh install of Ubuntu LTS, Debian 8 or CentOS 7/6.
Use this one-liner to set up an IPsec VPN server:
```bash
wget https://git.io/vpnsetup -O vpnsetup.sh && sudo sh vpnsetup.sh
```
If using CentOS, replace `https://git.io/vpnsetup` above with `https://git.io/vpnsetup-centos`.
Your VPN login details will be randomly generated, and displayed on the screen when finished.
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.
## Features
- **New:** The faster `IPsec/XAuth ("Cisco IPsec")` mode is supported
@ -48,7 +67,7 @@ Please refer to <a href="https://blog.ls20.com/ipsec-l2tp-vpn-auto-setup-for-ubu
**-OR-**
A dedicated server or Virtual Private Server (VPS), freshly installed with one of the above OS. In addition, Debian 7 (Wheezy) can be used with <a href="extras/vpnsetup-debian-7-workaround.sh" target="_blank">this workaround</a>. OpenVZ VPS is NOT supported, users could instead try <a href="https://github.com/Nyr/openvpn-install" target="_blank">OpenVPN</a>.
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 <a href="extras/vpnsetup-debian-7-workaround.sh" target="_blank">this workaround</a>. OpenVZ VPS is NOT supported, users could instead try <a href="https://github.com/Nyr/openvpn-install" target="_blank">OpenVPN</a>.
This also includes Linux VMs in public clouds, such as <a href="https://blog.ls20.com/digitalocean" target="_blank">DigitalOcean</a>, <a href="https://blog.ls20.com/vultr" target="_blank">Vultr</a>, <a href="https://blog.ls20.com/linode" target="_blank">Linode</a>, <a href="https://cloud.google.com/compute/" target="_blank">Google Compute Engine</a>, <a href="https://amazonlightsail.com" target="_blank">Amazon Lightsail</a>, <a href="https://azure.microsoft.com" target="_blank">Microsoft Azure</a>, <a href="http://www.softlayer.com/" target="_blank">IBM SoftLayer</a>, <a href="https://www.rackspace.com" target="_blank">Rackspace</a> and <a href="http://vcloud.vmware.com" target="_blank">VMware vCloud Air</a>.