From aeb4f4ab6aaece55a3b4ead03f1983e55a00d915 Mon Sep 17 00:00:00 2001
From: Radon Rosborough <radon.neon@gmail.com>
Date: Sat, 17 Jul 2021 08:39:28 +0000
Subject: [PATCH] Fix various bugs

---
 docker/admin/install.bash |  1 -
 packer/config.pkr.hcl     | 16 +++++++++++++---
 tf/ec2.tf                 |  1 +
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/docker/admin/install.bash b/docker/admin/install.bash
index fad7e51..b06e6fc 100755
--- a/docker/admin/install.bash
+++ b/docker/admin/install.bash
@@ -49,7 +49,6 @@ man
 moreutils
 nodejs
 packer
-prettier
 psmisc
 python3-pip
 pwgen
diff --git a/packer/config.pkr.hcl b/packer/config.pkr.hcl
index f6d2a5a..fd4962f 100644
--- a/packer/config.pkr.hcl
+++ b/packer/config.pkr.hcl
@@ -38,9 +38,19 @@ source "amazon-ebs" "ubuntu" {
   source_ami    = "${data.amazon-ami.ubuntu.id}"
   ssh_username  = "ubuntu"
 
-  tags {
-    BillingCategory = "Riju"
-    BillingCategory = "Riju:AMI"
+  tag {
+    key = "BillingCategory"
+    value = "Riju"
+  }
+
+  tag {
+    key = "BillingSubcategory"
+    value = "Riju:AMI"
+  }
+
+  tag {
+    key = "Name"
+    value = "riju-${local.timestamp}"
   }
 }
 
diff --git a/tf/ec2.tf b/tf/ec2.tf
index a5fefe8..b9557a8 100644
--- a/tf/ec2.tf
+++ b/tf/ec2.tf
@@ -57,6 +57,7 @@ resource "aws_instance" "dev_server" {
   lifecycle {
     ignore_changes = [
       ami,
+      instance_state,
       security_groups, # legacy
     ]
   }