Interactive Terraform plan -> apply cycle

15 files changed, 10 insertions, 12 deletions

diff --git a/README.md b/README.md
index 4834369..897dce3 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,8 @@
 ## Re-creating everything from scratch
 
 ```shell
+git crypt unlock
+direnv allow
 ./terraform-update.sh
 # ...wait for the DNS to propagate...
 ./nixos-update.sh
diff --git a/nixos-update.sh b/nixos-update.sh
index b4deb7e..d8a3750 100755
--- a/nixos-update.sh
+++ b/nixos-update.sh
@@ -4,9 +4,6 @@
 set -Eeuo pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-git crypt unlock
-direnv allow
-
 envsubst < vps-configuration.env.nix | ssh "$TLD" 'cat > /tmp/tmp.nix'
 echo "${USER_PASSWORD}" | ssh "$TLD" sudo -S mv /tmp/tmp.nix /etc/nixos/configuration.nix
 echo "${USER_PASSWORD}" | ssh "$TLD" sudo -S -i nixos-rebuild switch --upgrade
diff --git a/secrets/terraform/plan-files/2020-08-10T14:21:45-03:00 b/secrets/terraform/plan-files/2020-08-10T14:21:45-03:00
new file mode 100644
index 0000000..435bb71
--- /dev/null
+++ b/secrets/terraform/plan-files/2020-08-10T14:21:45-03:00
diff --git a/secrets/terraform/plan-files/2020-08-10T14:25:48-03:00 b/secrets/terraform/plan-files/2020-08-10T14:25:48-03:00
new file mode 100644
index 0000000..31d8e26
--- /dev/null
+++ b/secrets/terraform/plan-files/2020-08-10T14:25:48-03:00
diff --git a/secrets/terraform/plan-files/2020-08-10T14:26:51-03:00 b/secrets/terraform/plan-files/2020-08-10T14:26:51-03:00
new file mode 100644
index 0000000..2fb090f
--- /dev/null
+++ b/secrets/terraform/plan-files/2020-08-10T14:26:51-03:00
diff --git a/secrets/terraform/plan-files/2020-08-10T14:29:15-03:00 b/secrets/terraform/plan-files/2020-08-10T14:29:15-03:00
new file mode 100644
index 0000000..d30da89
--- /dev/null
+++ b/secrets/terraform/plan-files/2020-08-10T14:29:15-03:00
diff --git a/secrets/terraform/plan-files/2020-08-10T14:29:25-03:00 b/secrets/terraform/plan-files/2020-08-10T14:29:25-03:00
new file mode 100644
index 0000000..1b64a11
--- /dev/null
+++ b/secrets/terraform/plan-files/2020-08-10T14:29:25-03:00
diff --git a/secrets/terraform/plan-files/2020-08-10T14:29:32-03:00 b/secrets/terraform/plan-files/2020-08-10T14:29:32-03:00
new file mode 100644
index 0000000..3a51d5c
--- /dev/null
+++ b/secrets/terraform/plan-files/2020-08-10T14:29:32-03:00
diff --git a/secrets/terraform/plan-files/2020-08-10T14:29:58-03:00 b/secrets/terraform/plan-files/2020-08-10T14:29:58-03:00
new file mode 100644
index 0000000..d6df6c8
--- /dev/null
+++ b/secrets/terraform/plan-files/2020-08-10T14:29:58-03:00
diff --git a/secrets/terraform/plan-files/2020-08-10T14:30:06-03:00 b/secrets/terraform/plan-files/2020-08-10T14:30:06-03:00
new file mode 100644
index 0000000..655805c
--- /dev/null
+++ b/secrets/terraform/plan-files/2020-08-10T14:30:06-03:00
diff --git a/secrets/terraform/plan-files/2020-08-10T14:34:46-03:00 b/secrets/terraform/plan-files/2020-08-10T14:34:46-03:00
new file mode 100644
index 0000000..7463ab8
--- /dev/null
+++ b/secrets/terraform/plan-files/2020-08-10T14:34:46-03:00
diff --git a/secrets/terraform/terraform.tfstate b/secrets/terraform/terraform.tfstate
index 5004374..230d339 100644
--- a/secrets/terraform/terraform.tfstate
+++ b/secrets/terraform/terraform.tfstate
diff --git a/secrets/terraform/terraform.tfstate.backup b/secrets/terraform/terraform.tfstate.backup
index 293d803..caf405f 100644
--- a/secrets/terraform/terraform.tfstate.backup
+++ b/secrets/terraform/terraform.tfstate.backup
diff --git a/terraform-update.sh b/terraform-update.sh
index 436d7a1..ac2b9ca 100755
--- a/terraform-update.sh
+++ b/terraform-update.sh
@@ -4,10 +4,9 @@
 set -Eeuo pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-git crypt unlock
-direnv allow
-
 terraform init
 PLAN_FILE="./secrets/terraform/plan-files/$(date -Iseconds)"
-terraform plan  -input=false -out="${PLAN_FILE}"
-terraform apply -input=false "${PLAN_FILE}"
+terraform plan -out="${PLAN_FILE}"
+# shellcheck disable=2162
+read -p "Is the above Terraform plan acceptable?."
+terraform apply "${PLAN_FILE}"
diff --git a/vps.tf b/vps.tf
index 3a84b00..5c03529 100644
--- a/vps.tf
+++ b/vps.tf
@@ -49,6 +49,10 @@ resource "vultr_server" "vps_server" {
   snapshot_id = "e1d5f317b0f7a"
 }
 
+output "public_ip" {
+  value = vultr_server.vps_server.main_ip
+}
+
 resource "vultr_block_storage" "vps_storage" {
   size_gb     = 10
   region_id   = 9
@@ -60,10 +64,6 @@ resource "vultr_block_storage" "vps_storage" {
 
 # DNS and IP configuration
 
-output "public_ip" {
-  value = vultr_server.vps_server.main_ip
-}
-
 resource "vultr_dns_domain" "vps_tld" {
   domain    = var.tld
   server_ip = vultr_server.vps_server.main_ip