last-minute formatting

- Add new AMI name sorting constraints for new OS optipns.
- Add new OS options.
- Add warning in output for Debian users.
- Add additional line for better organization.

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)。</details>
 
-- 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（预共享密钥）

aws/README.md

@@ -11,7 +11,8 @@ Available customization parameters:
 > </summary>
 > 
 > 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/).</details>
-- 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)

aws/cloudformation-template-ipsec.json

@@ -5,6 +5,18 @@
             "Ubuntu2004": {
                 "HelperInstallationCommands": "export DEBIAN_FRONTEND=noninteractive\napt-get -yq update\napt-get -yq install python3-pip\npython3 -m pip install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz\n"
             },
+            "Ubuntu2204": {
+                "HelperInstallationCommands": "export DEBIAN_FRONTEND=noninteractive\napt-get -yq update\napt-get -yq install python3-pip\npython3 -m pip install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz\n"
+            },
+            "Debian10": {
+                "HelperInstallationCommands": "export DEBIAN_FRONTEND=noninteractive\napt-get -yq update\napt-get -yq install python3-pip\npython3 -m pip install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz\n"
+            },
+            "Debian11": {
+                "HelperInstallationCommands": "export DEBIAN_FRONTEND=noninteractive\napt-get -yq update\napt-get -yq install python3-pip\npython3 -m pip install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz\n"
+            },
+            "Debian12": {
+                "HelperInstallationCommands": "export DEBIAN_FRONTEND=noninteractive\nrm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED\napt-get -yq update\napt-get -yq install python3-pip\npython3 -m pip install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz\n"
+            },
             "CentOS7": {
                 "HelperInstallationCommands": "yum -y install python3 wget\npython3 -m pip install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz\n"
             },
@@ -358,10 +370,14 @@
                                 "       ec2 = boto3.client('ec2',regionName)",
                                 "       AMIName = {",
                                 "           'Ubuntu2004': 'ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*',",
+                                "           'Ubuntu2204': 'ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-*',",
+                                "           'Debian10': 'debian-10-amd64-*',",
+                                "           'Debian11': 'debian-11-amd64-*',",
+                                "           'Debian12': 'debian-12-amd64-*',",
                                 "           'CentOS7': 'CentOS 7.9.2009 x86_64',",
                                 "           'AmazonLinux2': 'amzn2-ami-hvm-*.*-x86_64-gp2',",
                                 "       }[distribution]",
-                                "       response = ec2.describe_images(Filters=[{'Name':'name', 'Values':[AMIName]}], Owners=['099720109477', '379101102735', '125523088429', 'amazon'])",
+                                "       response = ec2.describe_images(Filters=[{'Name':'name', 'Values':[AMIName]}], Owners=['099720109477', '136693071363', '125523088429', 'amazon'])",
                                 "       images = response['Images']",
                                 "       images.sort(key=creation_date,reverse=True)",
                                 "       AMIId = images[0]['ImageId']",
@@ -485,10 +501,14 @@
         },
         "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",
+                "Debian10",
+                "Debian11",
+                "Debian12",
                 "CentOS7",
                 "AmazonLinux2"
             ]
@@ -553,6 +573,10 @@
         "NextStep": {
             "Description": "Learn how to configure VPN clients.",
             "Value": "https://github.com/hwdsl2/setup-ipsec-vpn#next-steps"
+        },
+        "WarningForDebianUsers": {
+            "Description": "Please be noted that due to Debian images on AWS EC2 using cloud kernels, you are unable to use IPSec/L2TP mode if your server is running Debian. For more information, please refer to the link to the left.",
+            "Value": "https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/docs/clients.md#debian-kernel"
         }
     }
 }