From 3468d27e615f8532f550518043ce4539ebd9d09e Mon Sep 17 00:00:00 2001
From: Jack Ivanov <17044561+jackivanov@users.noreply.github.com>
Date: Mon, 22 Oct 2018 23:49:18 +0300
Subject: [PATCH] Lightsail back (#1157)

---
 CHANGELOG.md                            | 4 ++++
 README.md                               | 2 +-
 config.cfg                              | 2 +-
 input.yml                               | 1 +
 roles/cloud-lightsail/tasks/prompts.yml | 4 ++--
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 417b757..27bd579 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 20 Oct 2018
+### Added
+- AWS Lightsail
+
 ## 7 Sep 2018
 ### Changed
 - Azure: Deployment via Azure Resource Manager
diff --git a/README.md b/README.md
index 26440fd..ccd21c4 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Algo VPN is a set of Ansible scripts that simplify the setup of a personal IPSEC
 * Blocks ads with a local DNS resolver (optional)
 * Sets up limited SSH users for tunneling traffic (optional)
 * Based on current versions of Ubuntu and strongSwan
-* Installs to DigitalOcean, Amazon EC2, Vultr, Microsoft Azure, Google Compute Engine, Scaleway, OpenStack or your own Ubuntu 18.04 LTS server
+* Installs to DigitalOcean, Amazon Lightsail, Amazon EC2, Vultr, Microsoft Azure, Google Compute Engine, Scaleway, OpenStack or your own Ubuntu 18.04 LTS server
 
 ## Anti-features
 
diff --git a/config.cfg b/config.cfg
index f1721e5..03f439e 100644
--- a/config.cfg
+++ b/config.cfg
@@ -129,7 +129,7 @@ cloud_providers:
     external_static_ip: false
   lightsail:
     size: nano_1_0
-    image: ubuntu_16_04
+    image: ubuntu_18_04
   scaleway:
     size: START1-S
     image: Ubuntu Bionic Beaver
diff --git a/input.yml b/input.yml
index 1853451..f24ab2b 100644
--- a/input.yml
+++ b/input.yml
@@ -13,6 +13,7 @@
       store_cakey: false
     providers_map:
       - { name: DigitalOcean, alias: digitalocean }
+      - { name: Amazon Lightsail, alias: lightsail }
       - { name: Amazon EC2, alias: ec2 }
       - { name: Vultr, alias: vultr }
       - { name: Microsoft Azure, alias: azure }
diff --git a/roles/cloud-lightsail/tasks/prompts.yml b/roles/cloud-lightsail/tasks/prompts.yml
index 26d50a5..de6a02d 100644
--- a/roles/cloud-lightsail/tasks/prompts.yml
+++ b/roles/cloud-lightsail/tasks/prompts.yml
@@ -37,7 +37,7 @@
     set_fact:
       default_region: >-
         {% for r in lightsail_regions %}
-        {%- if r['name'] == "eu-west-1" %}{{ loop.index }}{% endif %}
+        {%- if r['name'] == "us-east-1" %}{{ loop.index }}{% endif %}
         {%- endfor %}
 
   - pause:
@@ -45,7 +45,7 @@
         What region should the server be located in?
         (https://aws.amazon.com/about-aws/global-infrastructure/regional-product-services/)
           {% for r in lightsail_regions %}
-          {{ loop.index }}. {{ r['name'] }}       {{ r['displayName'] }}
+          {{ (loop.index|string + '.').ljust(3) }} {{ r['name'].ljust(20) }} {{ r['displayName'] }}
           {% endfor %}
 
         Enter the number of your desired region