From e8cd230c12303bdfbcc060d400f2287beea7fd4d Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Fri, 3 Feb 2017 10:32:22 -0800
Subject: [PATCH] ami: remove ssh keys and fix subnet

---
 baseimage/createAMI.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/baseimage/createAMI.sh b/baseimage/createAMI.sh
index 2afed0e8c..a43a827f9 100755
--- a/baseimage/createAMI.sh
+++ b/baseimage/createAMI.sh
@@ -35,11 +35,13 @@ while true; do
         case "$2" in
         "us-east-1")
             image_id="ami-6edd3078"
-            security_group="sg-bcee70c0"
+            security_group="sg-a5e17fd9"
+            subnet_id="subnet-b8fbc0f1"
             ;;
         "eu-central-1")
             image_id="ami-5aee2235"
             security_group="sg-19f5a770" # everything open on eu-central-1
+            subnet_id=""
             ;;
         *)
             echo "Unknown aws region $2"
@@ -86,7 +88,7 @@ if [[ -z "${ami_name}" ]]; then
 fi
 
 echo "=> Create EC2 instance"
-id=$(aws ec2 run-instances --image-id "${image_id}" --instance-type "${INSTANCE_TYPE}" --security-group-ids "${security_group}" --block-device-mappings "${BLOCK_DEVICE}" --key-name "${SSH_KEY_NAME}" --subnet-id "subnet-8c1a5ad7" \
+id=$(aws ec2 run-instances --image-id "${image_id}" --instance-type "${INSTANCE_TYPE}" --security-group-ids "${security_group}" --block-device-mappings "${BLOCK_DEVICE}" --key-name "${SSH_KEY_NAME}" --subnet-id "${subnet_id}" --associate-public-ip-address \
     | $JSON Instances \
     | $JSON 0.InstanceId)
 
@@ -137,6 +139,9 @@ done
 echo "=> Running cloudron-setup"
 $SSH ubuntu@${server_ip} sudo /bin/bash "cloudron-setup" --env "${deploy_env}" --provider "ec2"
 
+echo "=> Removing ssh key"
+$SSH ubuntu@${server_ip} sudo rm /home/ubuntu/.ssh/authorized_keys
+
 echo "=> Creating AMI"
 image_id=$(aws ec2 create-image --instance-id "${id}" --name "${ami_name}" | $JSON ImageId)
 [[ -z "$id" ]] && exit 1