diff --git a/README-zh.md b/README-zh.md index a2ff702..f49bf62 100644 --- a/README-zh.md +++ b/README-zh.md @@ -96,14 +96,14 @@ wget https://git.io/vpnsetup-amzn -O vpnsetup.sh && sudo sh vpnsetup.sh 这也包括各种公共云服务中的 Linux 虚拟机,比如 DigitalOcean, Vultr, Linode, Google Compute Engine, Amazon Lightsail, Microsoft Azure, IBM Cloud, OVHRackspace。 -Deploy to Azure Install on DigitalOcean Deploy to Linode +Deploy to AWS Deploy to Azure Install on DigitalOcean Deploy to Linode **» 我想建立并使用自己的 VPN ,但是没有可用的服务器** 高级用户可以在一个 $35 的 Raspberry Pi 上搭建 VPN 服务器。参见 [1] [2] -\* Debian 10 用户需要使用标准的 Linux 内核(而不是 "cloud" 版本)。更多信息请看 这里。 +\* Debian 10 用户需要使用标准的 Linux 内核(而不是 "cloud" 版本)。更多信息请看 这里。如果你在 EC2 上使用 Debian 10,你必须首先换用标准的 Linux 内核,然后运行 VPN 安装脚本。 :warning: **不要** 在你的 PC 或者 Mac 上运行这些脚本!它们只能用在服务器上! @@ -241,7 +241,7 @@ sh vpnsetup.sh ``` -**注:** 如果无法通过 `wget` 下载,你也可以打开 vpnsetup.sh,然后点击右方的 **`Raw`** 按钮。按快捷键 `Ctrl-A` 全选, `Ctrl-C` 复制,然后粘贴到你喜欢的编辑器。 +**注:** 如果无法通过 `wget` 下载,你也可以打开 vpnsetup.shvpnsetup_centos.sh 或者 vpnsetup_amzn.sh,然后点击右方的 **`Raw`** 按钮。按快捷键 `Ctrl-A` 全选, `Ctrl-C` 复制,然后粘贴到你喜欢的编辑器。 ## 下一步 diff --git a/README.md b/README.md index edccf64..5645027 100644 --- a/README.md +++ b/README.md @@ -96,14 +96,14 @@ A dedicated server or virtual private server (VPS), freshly installed with one o This also includes Linux VMs in public clouds, such as DigitalOcean, Vultr, Linode, Google Compute Engine, Amazon Lightsail, Microsoft Azure, IBM Cloud, OVH and Rackspace. -Deploy to Azure Install on DigitalOcean Deploy to Linode +Deploy to AWS Deploy to Azure Install on DigitalOcean Deploy to Linode **» I want to run my own VPN but don't have a server for that** Advanced users can set up the VPN server on a $35 Raspberry Pi. See [1] [2]. -\* Debian 10 users should use the standard Linux kernel (not the "cloud" version). Read more here. +\* Debian 10 users should use the standard Linux kernel (not the "cloud" version). Read more here. If using Debian 10 on EC2, you must first switch to the standard Linux kernel before running the VPN setup script. :warning: **DO NOT** run these scripts on your PC or Mac! They should only be used on a server! @@ -241,7 +241,7 @@ sh vpnsetup.sh ``` -**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. +**Note:** If unable to download via `wget`, you may also open vpnsetup.sh, vpnsetup_centos.sh or vpnsetup_amzn.sh, and click the **`Raw`** button on the right. Press `Ctrl-A` to select all, `Ctrl-C` to copy, then paste into your favorite editor. ## Next steps diff --git a/docs/clients-zh.md b/docs/clients-zh.md index 531a289..548fdae 100644 --- a/docs/clients-zh.md +++ b/docs/clients-zh.md @@ -340,9 +340,9 @@ Android 设备在进入睡眠模式不久后也会断开 Wi-Fi 连接,如果 ### Debian 10 内核 -Debian 10 用户: 运行 `uname -r` 以检查你的服务器的 Linux 内核版本。如果它包含 `cloud` 字样,并且 `/dev/ppp` 不存在,则该内核缺少 `ppp` 支持从而不能使用 IPsec/L2TP 模式([IPsec/XAuth 模式](clients-xauth-zh.md) 不受影响)。 +Debian 10 用户:运行 `uname -r` 以检查你的服务器的 Linux 内核版本。如果它包含 `cloud` 字样,并且 `/dev/ppp` 不存在,则该内核缺少 `ppp` 支持从而不能使用 IPsec/L2TP 模式。VPN 安装脚本会尝试检测此情形,并显示错误。 -要解决此问题,你可以换用标准的 Linux 内核,通过安装比如 `linux-image-amd64` 软件包来实现。然后更新 GRUB 的内核默认值并重启。 +要解决此问题,你可以换用标准的 Linux 内核,通过安装比如 `linux-image-amd64` 软件包来实现。然后更新 GRUB 的内核默认值并重启服务器。最后重新运行 VPN 安装脚本。 ### Chromebook 连接问题 diff --git a/docs/clients.md b/docs/clients.md index e38fcb0..62ebebf 100644 --- a/docs/clients.md +++ b/docs/clients.md @@ -339,9 +339,9 @@ Android devices will also disconnect Wi-Fi shortly after entering sleep mode, un ### Debian 10 kernel -Debian 10 users: Run `uname -r` to check your server's Linux kernel version. If it contains the word "cloud", and `/dev/ppp` is missing, then the kernel lacks `ppp` support and cannot use IPsec/L2TP mode ([IPsec/XAuth mode](clients-xauth.md) is not affected). +Debian 10 users: Run `uname -r` to check your server's Linux kernel version. If it contains the word "cloud", and `/dev/ppp` is missing, then the kernel lacks `ppp` support and cannot use IPsec/L2TP mode. The VPN setup scripts try to detect this and show an error. -To fix, you may switch to the standard Linux kernel by installing e.g. the `linux-image-amd64` package. Then update the default kernel in GRUB and reboot. +To fix, you may switch to the standard Linux kernel by installing e.g. the `linux-image-amd64` package. Then update the default kernel in GRUB and reboot your server. Finally, re-run the VPN setup script. ### Chromebook issues diff --git a/docs/images/aws-deploy-button.png b/docs/images/aws-deploy-button.png new file mode 100644 index 0000000..4ad4c33 Binary files /dev/null and b/docs/images/aws-deploy-button.png differ