From 9d565ce547349d109ae86c51fa2a152ae8df0deb Mon Sep 17 00:00:00 2001 From: Scottpedia Date: Fri, 21 Jul 2023 11:43:29 +0800 Subject: [PATCH] add OS options to docs and change default OS to Ubuntu22.04 --- aws/README-zh.md | 2 +- aws/README.md | 2 +- aws/cloudformation-template-ipsec.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aws/README-zh.md b/aws/README-zh.md index 9d48b02..0c244b4 100644 --- a/aws/README-zh.md +++ b/aws/README-zh.md @@ -12,7 +12,7 @@ > > 比如 `m5a.large` 可能无法在 `ap-east-1` 区域部署(仅为假设)。在此情况下,你会在部署过程中遇到此错误:`The requested configuration is currently not supported. Please check the documentation for supported configurations`。新开放的 AWS 区域更容易出现此问题,因为它们提供的实例类型较少。如需了解更多关于实例可用性的信息,请参见 [https://ec2instances.info](https://ec2instances.info)。 -- VPN 服务器的操作系统(Ubuntu 20.04, CentOS 7, Amazon Linux 2) +- VPN 服务器的操作系统(Ubuntu 22.04/20.04, Debian 10/11/12, CentOS 7, Amazon Linux 2) - 你的 VPN 用户名 - 你的 VPN 密码 - 你的 VPN IPsec PSK(预共享密钥) diff --git a/aws/README.md b/aws/README.md index 92ff888..d8c7ce0 100644 --- a/aws/README.md +++ b/aws/README.md @@ -12,7 +12,7 @@ Available customization parameters: > > For example, you may not be able to deploy an `m5a.large` instance in `ap-east-1` (hypothetically). In that case, you might experience the following error during deployment: `The requested configuration is currently not supported. Please check the documentation for supported configurations`. Newly released regions are more prone to having this problem as there are less variety of instances. For more info about instance type availability, refer to [https://instances.vantage.sh/](https://instances.vantage.sh/). -- OS for your VPN server (Ubuntu 20.04, CentOS 7, Amazon Linux 2) +- OS for your VPN server (Ubuntu 22.04/20.04, Debian 10/11/12, CentOS 7, Amazon Linux 2) - Your VPN username - Your VPN password - Your VPN IPsec PSK (pre-shared key) diff --git a/aws/cloudformation-template-ipsec.json b/aws/cloudformation-template-ipsec.json index 2e49d6e..6ba6bfb 100644 --- a/aws/cloudformation-template-ipsec.json +++ b/aws/cloudformation-template-ipsec.json @@ -501,8 +501,8 @@ }, "OS": { "Type": "String", - "Description": "The OS of your VPN server. Default: Ubuntu 20.04", - "Default": "Ubuntu2004", + "Description": "The OS of your VPN server. Default: Ubuntu 22.04", + "Default": "Ubuntu2204", "AllowedValues": [ "Ubuntu2004", "Ubuntu2204",