From 3d957e3ace1b26a46803ad4c73bdd7a86437e956 Mon Sep 17 00:00:00 2001
From: Scottpedia <blacksusername@gmail.com>
Date: Mon, 24 Aug 2020 09:48:27 -0400
Subject: [PATCH] Add debian10 and Ubuntu10.04

---
 aws/README.md                     | 4 ++--
 aws/cloudformation-template-ipsec | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/aws/README.md b/aws/README.md
index 2985bd8..971ebea 100644
--- a/aws/README.md
+++ b/aws/README.md
@@ -9,8 +9,8 @@ You can also use `t2.micro` instance as your server for your deployment, which i
 ## Available Customization Parameters:
 
 - AWS EC2 Instance Type
-- OS for your VPN Server (Ubuntu16.04, Ubuntu18.04 or Debian9-stretch)
-> **Note:** To use Debian9 on EC2, to need to [**subscribe**](https://aws.amazon.com/marketplace/pp/B073HW9SP3) first.
+- OS for your VPN Server (Ubuntu16.04, Ubuntu18.04, Debian9-Stretch or Debian10-Buster)
+> **Note:** To use Debian9 or Debian10 images on EC2, to need to subscribe them first at AWS marketplace. [**Debian9**](https://aws.amazon.com/marketplace/pp/B073HW9SP3) [**Debian10**](https://aws.amazon.com/marketplace/pp/B0859NK4HC)
 - Your VPN username
 - Your VPN password
 - IPSec PSK (pre-shared key)
diff --git a/aws/cloudformation-template-ipsec b/aws/cloudformation-template-ipsec
index 200246a..32dea39 100644
--- a/aws/cloudformation-template-ipsec
+++ b/aws/cloudformation-template-ipsec
@@ -581,8 +581,12 @@
                                 "           IAMName = 'ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-*'",
                                 "       elif distribution == 'Ubuntu18.04':",
                                 "           IAMName = 'ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-*'",
+                                "       elif distribution == 'Ubuntu20.04':",
+                                "           IAMName = 'ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*'",
                                 "       elif distribution == 'Debian9':",
                                 "           IAMName = 'debian-stretch-hvm-x86_64-gp2-*'",
+                                "       elif distribution == 'Debian10':",
+                                "           IAMName = 'debian-10-amd64-*'",
                                 "       response = ec2.describe_images(Filters=[{'Name':'name', 'Values':[IAMName]}])",
                                 "       images = response['Images']",
                                 "       images.sort(key=creation_date,reverse=True)",
@@ -732,7 +736,9 @@
             "AllowedValues": [
                 "Ubuntu16.04",
                 "Ubuntu18.04",
-                "Debian9"
+                "Ubuntu20.04",
+                "Debian9",
+                "Debian10"
             ]
         },
         "InstanceType": {