From 28f6a0ab2865bc52c1fd116627eba1ee82dacc66 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Mon, 23 May 2016 13:04:22 -0500 Subject: [PATCH] Update README.md --- README-zh.md | 10 ++++------ README.md | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/README-zh.md b/README-zh.md index 35d07e2..a08aa5c 100644 --- a/README-zh.md +++ b/README-zh.md @@ -1,7 +1,4 @@ -# IPsec/L2TP VPN 服务器一键安装脚本 - -[![Build Status](https://img.shields.io/travis/hwdsl2/setup-ipsec-vpn.svg)](https://travis-ci.org/hwdsl2/setup-ipsec-vpn) -[![Docker Ready](https://img.shields.io/badge/docker-ready-blue.svg)](https://github.com/hwdsl2/docker-ipsec-vpn-server) +# IPsec/L2TP VPN 服务器一键安装脚本 Build status *其他语言版本: [English](README.md), [简体中文](README-zh.md).* @@ -29,7 +26,8 @@ ## 功能特性 -- :tada: **NEW:** 新增支持更高效的 `IPsec/XAuth ("Cisco IPsec")` 模式 +- **NEW:** 新增支持更高效的 `IPsec/XAuth ("Cisco IPsec")` 模式 +- **NEW:** 现在可以下载 VPN 服务器的预构建 Docker 映像 - 全自动的 IPsec/L2TP VPN 服务器配置,无需用户输入 - 封装所有的 VPN 流量在 UDP 协议,不需要 ESP 协议支持 - 可直接作为 Amazon EC2 实例创建时的用户数据使用 @@ -133,7 +131,7 @@ sudo sh vpnsetup_centos.sh ... ... ``` -你可以添加更多用户,每个用户对应文件中的一行。**不要**在用户名和密码中使用这些字符:`\ "` +你可以添加更多用户,每个用户对应文件中的一行。**不要**在用户名,密码或 PSK 中使用这些字符:`\ " '` 对于 `IPsec/XAuth ("Cisco IPsec")`, VPN 用户账户信息保存在文件 `/etc/ipsec.d/passwd`。该文件的格式如下: diff --git a/README.md b/README.md index 675a8d2..dfab02c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,4 @@ -# IPsec/L2TP VPN Server Auto Setup Scripts - -[![Build Status](https://img.shields.io/travis/hwdsl2/setup-ipsec-vpn.svg)](https://travis-ci.org/hwdsl2/setup-ipsec-vpn) -[![Docker Ready](https://img.shields.io/badge/docker-ready-blue.svg)](https://github.com/hwdsl2/docker-ipsec-vpn-server) +# IPsec/L2TP VPN Server Auto Setup Scripts Build status *Read this in other languages: [English](README.md), [简体中文](README-zh.md).* @@ -29,7 +26,8 @@ We will use Libreswan as th ## Features -- :tada: **NEW:** The faster `IPsec/XAuth ("Cisco IPsec")` mode is now supported +- **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/L2TP 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 @@ -133,7 +131,7 @@ For `IPsec/L2TP`, VPN users are specified in `/etc/ppp/chap-secrets`. The format ... ... ``` -You can add more users, use one line for each user. DO NOT use the characters `\` and `"` inside username or password. +You can add more users, use one line for each user. DO NOT use these characters inside values: `\ " '` For `IPsec/XAuth ("Cisco IPsec")`, VPN users are specified in `/etc/ipsec.d/passwd`. The format of this file is: