From e785263b5e3dba8045cad2fdc6d05fc71d5e4b3c Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Sat, 26 Dec 2020 00:23:34 -0600 Subject: [PATCH] Update docs --- README-zh.md | 19 +++++++++++++++---- README.md | 19 +++++++++++++++---- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/README-zh.md b/README-zh.md index 258837c..43e43ec 100644 --- a/README-zh.md +++ b/README-zh.md @@ -62,6 +62,7 @@ wget https://git.io/vpnsetup -O vpnsetup.sh && sudo sh vpnsetup.sh - Debian 10 (Buster)[\*](#debian-10-note) 或者 9 (Stretch) - CentOS 8 或者 7 - Red Hat Enterprise Linux (RHEL) 8 或者 7 +- Amazon Linux 2 请参见 详细步骤 以及 EC2 定价细节。另外，你也可以使用 CloudFormation 来快速部署。 @@ -119,7 +120,7 @@ VPN_PASSWORD='你的VPN密码' \ sh vpnsetup.sh ``` -**注：** 如果无法通过 `wget` 下载，你也可以打开 vpnsetup.sh (或者 vpnsetup_centos.sh)，然后点击右方的 **`Raw`** 按钮。按快捷键 `Ctrl-A` 全选， `Ctrl-C` 复制，然后粘贴到你喜欢的编辑器。 +**注：** 如果无法通过 `wget` 下载，你也可以打开 vpnsetup.sh，然后点击右方的 **`Raw`** 按钮。按快捷键 `Ctrl-A` 全选， `Ctrl-C` 复制，然后粘贴到你喜欢的编辑器。 ### CentOS & RHEL @@ -127,6 +128,14 @@ sh vpnsetup.sh 按照与上面相同的步骤，但是将 `https://git.io/vpnsetup` 换成 `https://git.io/vpnsetup-centos`。 +### Amazon Linux 2 + +首先，更新你的系统： 运行 `yum update` 并重启。这一步是可选的，但推荐。 + +按照与上面相同的步骤，但是将 `https://git.io/vpnsetup` 换成 `https://bit.ly/vpnsetup-amzn`。 + +**注：** 在阅读本项目的文档时，对于 Amazon Linux 2 请参见 CentOS/RHEL 部分。 + ## 下一步 配置你的计算机或其它设备使用 VPN 。请参见： @@ -167,13 +176,15 @@ sh vpnsetup.sh ## 升级Libreswan -提供两个额外的脚本 vpnupgrade.sh 和 vpnupgrade_centos.sh，可用于升级 Libreswan （更新日志 | 通知列表）。请在运行前根据需要修改 `SWAN_VER` 变量。查看已安装版本： `ipsec --version`. +在 extras/ 目录提供额外的脚本，可用于升级 Libreswan（更新日志 | 通知列表）。请在运行前根据需要修改 `SWAN_VER` 变量。查看已安装版本： `ipsec --version`. ```bash # Ubuntu & Debian -wget https://git.io/vpnupgrade -O vpnupgrade.sh +wget https://git.io/vpnupgrade -O vpnupgrade.sh && sudo sh vpnupgrade.sh # CentOS & RHEL -wget https://git.io/vpnupgrade-centos -O vpnupgrade.sh +wget https://git.io/vpnupgrade-centos -O vpnupgrade.sh && sudo sh vpnupgrade.sh +# Amazon Linux 2 +wget https://bit.ly/vpnupgrade-amzn -O vpnupgrade.sh && sudo sh vpnupgrade.sh ``` ## 问题和反馈 diff --git a/README.md b/README.md index cf1abc5..08317b0 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,7 @@ A newly created Amazon EC2 - Debian 10 (Buster)[\*](#debian-10-note) or 9 (Stretch) - CentOS 8 or 7 - Red Hat Enterprise Linux (RHEL) 8 or 7 +- Amazon Linux 2 See detailed instructions and EC2 pricing. Alternatively, you can deploy rapidly using CloudFormation. @@ -119,7 +120,7 @@ VPN_PASSWORD='your_vpn_password' \ sh vpnsetup.sh ``` -**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. +**Note:** If unable to download via `wget`, you may also open vpnsetup.sh and click the **`Raw`** button. Press `Ctrl-A` to select all, `Ctrl-C` to copy, then paste into your favorite editor. ### CentOS & RHEL @@ -127,6 +128,14 @@ First, update your system with `yum update` and reboot. This is optional, but re Follow the same steps as above, but replace `https://git.io/vpnsetup` with `https://git.io/vpnsetup-centos`. +### Amazon Linux 2 + +First, update your system with `yum update` and reboot. This is optional, but recommended. + +Follow the same steps as above, but replace `https://git.io/vpnsetup` with `https://bit.ly/vpnsetup-amzn`. + +**Note:** When reading documentation in this project, refer to the CentOS/RHEL sections for Amazon Linux 2. + ## Next steps Get your computer or device to use the VPN. Please refer to: @@ -167,13 +176,15 @@ The scripts will backup existing config files before making changes, with `.old- ## Upgrade Libreswan -The additional scripts vpnupgrade.sh and vpnupgrade_centos.sh can be used to upgrade Libreswan (changelog | announce). Edit the `SWAN_VER` variable as necessary. Check which version is installed: `ipsec --version`. +The additional scripts in extras/ can be used to upgrade Libreswan (changelog | announce). Edit the `SWAN_VER` variable as necessary. Check which version is installed: `ipsec --version`. ```bash # Ubuntu & Debian -wget https://git.io/vpnupgrade -O vpnupgrade.sh +wget https://git.io/vpnupgrade -O vpnupgrade.sh && sudo sh vpnupgrade.sh # CentOS & RHEL -wget https://git.io/vpnupgrade-centos -O vpnupgrade.sh +wget https://git.io/vpnupgrade-centos -O vpnupgrade.sh && sudo sh vpnupgrade.sh +# Amazon Linux 2 +wget https://bit.ly/vpnupgrade-amzn -O vpnupgrade.sh && sudo sh vpnupgrade.sh ``` ## Bugs & Questions