From 68adddc969448083d5e0aa132aa3677912c64c66 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Wed, 10 Aug 2016 22:15:11 -0500 Subject: [PATCH] Update README.md [ci skip] --- README-zh.md | 8 +++++++- README.md | 29 +++++++---------------------- azure/README-zh.md | 27 +++++++++++++++++++++++++++ azure/README.md | 27 +++++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 23 deletions(-) create mode 100644 azure/README-zh.md create mode 100644 azure/README.md diff --git a/README-zh.md b/README-zh.md index 13b4a0b..a03d3e2 100644 --- a/README-zh.md +++ b/README-zh.md @@ -37,18 +37,24 @@ ## 系统要求 -一个新创建的 Amazon EC2 实例，使用这些 AMI： （详细步骤 看这里） +一个新创建的 Amazon EC2 实例，使用这些 AMI 之一： - Ubuntu 16.04 (Xenial), 14.04 (Trusty) or 12.04 (Precise) - Debian 8 (Jessie) EC2 Images - CentOS 7 (x86_64) with Updates - CentOS 6 (x86_64) with Updates +请参见 详细步骤 以及 EC2 定价细节。 + **-或者-** 一个专用服务器或者虚拟专用服务器 (VPS)，全新安装以上操作系统之一。另外也可使用 Debian 7 (Wheezy)，但是必须首先运行另一个脚本。 OpenVZ VPS 不受支持，用户可以尝试使用 ShadowsocksR 或者 OpenVPN。 这也包括各种云计算服务中的 Linux 虚拟机，比如 Google Compute Engine, Amazon EC2, Microsoft Azure, IBM SoftLayer, VMware vCloud Air, Rackspace, DigitalOcean, Vultr 和 Linode。 + + Deploy to Azure + + **» 我想建立并使用自己的 VPN ，但是没有可用的服务器** :warning: **不要** 在你的 PC 或者 Mac 上运行这些脚本！它们只能用在服务器上！ diff --git a/README.md b/README.md index f3ffdc7..331101e 100644 --- a/README.md +++ b/README.md @@ -37,39 +37,24 @@ We will use Libreswan as th ## Requirements -Microsoft Azure Subscription - -![Azure Custom Deployment](azure/custom_deployment_screenshot.png) - -The Template will create a fully working VPN server on the Microsoft Azure Cloud. Pricing details - -Customizable with the following options: - - - Username - - Password - - Pre-Shared Key - - Operating System Image (Debian 8 or Ubuntu 16.04 LTS) - - The size of the virtual machine. Default: Standard_A0 - - - - - - -**-OR-** - -A newly created Amazon EC2 instance, using these AMIs: (See instructions) +A newly created Amazon EC2 instance, using one of these AMIs: - Ubuntu 16.04 (Xenial), 14.04 (Trusty) or 12.04 (Precise) - Debian 8 (Jessie) EC2 Images - CentOS 7 (x86_64) with Updates - CentOS 6 (x86_64) with Updates +Please refer to detailed instructions and EC2 pricing. + **-OR-** 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, Vultr and Linode. + + Deploy to Azure + + **» I want to run my own VPN but don't have a server for that** :warning: **DO NOT** run these scripts on your PC or Mac! They should only be used on a server! diff --git a/azure/README-zh.md b/azure/README-zh.md new file mode 100644 index 0000000..e1eeeea --- /dev/null +++ b/azure/README-zh.md @@ -0,0 +1,27 @@ +# 在 Microsoft Azure 上部署 + +*其他语言版本: [English](README.md), [简体中文](README-zh.md).* + +使用这个模板，你可以在 Microsoft Azure Cloud 上快速搭建一个 VPN 服务器 （定价细节）。 + +根据你的偏好设置以下选项： + + - VPN Username （用户名） + - VPN Password （密码） + - IPsec Pre-Shared Key （预共享密钥） + - Operating System Image （操作系统镜像，Debian 8 或 Ubuntu 16.04 LTS） + - Virtual Machine Size （虚拟机大小，默认值： Standard_A0） + +请点击以下按钮开始： + + + Deploy to Azure + + +屏幕截图： + +![Azure Custom Deployment](custom_deployment_screenshot.png) + +## 作者 + +- Daniel Falkner (https://github.com/derdanu) diff --git a/azure/README.md b/azure/README.md new file mode 100644 index 0000000..736022c --- /dev/null +++ b/azure/README.md @@ -0,0 +1,27 @@ +# Deploy to Microsoft Azure + +*Read this in other languages: [English](README.md), [简体中文](README-zh.md).* + +This template will create a fully working VPN server on the Microsoft Azure Cloud (pricing details). + +Customizable with the following options: + + - VPN Username + - VPN Password + - IPsec Pre-Shared Key + - Operating System Image (Debian 8 or Ubuntu 16.04 LTS) + - Virtual Machine Size (Default: Standard_A0) + +Press this button to start: + + + Deploy to Azure + + +Screenshot: + +![Azure Custom Deployment](custom_deployment_screenshot.png) + +## Author + +- Daniel Falkner (https://github.com/derdanu)