ops: staging back online

darklab8 · Mar 3, 2024 · 9885b5f · 9885b5f
1 parent 2a6cd5f
commit 9885b5f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 27 deletions.
diff --git a/infra/tf/production/main.tf b/infra/tf/production/main.tf
@@ -11,9 +11,6 @@ module "stack" {
   datacenter   = "ash-dc1"
 }
 
-output "cluster_ip" {
-  value = module.stack.cluster_ip
-}
 
 data "aws_ssm_parameter" "darkbot" {
   name = "/terraform/hetzner/darkbot/production"

diff --git a/infra/tf/staging/main.tf b/infra/tf/staging/main.tf
@@ -1,18 +1,7 @@
-# module "stack" {
-#   source       = "../modules/hetzner_server"
-#   environment  = "staging"
-#   server_power = "cpx21"
-#   backups      = false
-# }
-
-# output "cluster_ip" {
-#   value = module.stack.cluster_ip
-# }
-
-# provider "docker" {
-#   host     = "ssh://root@${module.stack.cluster_ip}:22"
-#   ssh_opts = ["-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null", "-i", "~/.ssh/id_rsa.darklab"]
-# }
+module "server" {
+  source       = "../../../../infra/tf/modules/hetzner_server/data"
+  name         = "node-arm"
+}
 
 data "aws_ssm_parameter" "darkbot" {
   name = "/terraform/hetzner/darkbot/staging"
@@ -22,11 +11,16 @@ locals {
   secrets = nonsensitive(jsondecode(data.aws_ssm_parameter.darkbot.value))
 }
 
-# module "darkbot" {
-#   source              = "../modules/darkbot"
-#   configurator_dbname = "staging"
-#   consoler_prefix     = ","
-#   secrets             = local.secrets
-#   tag_version         = "v1.5.0"
-#   debug               = false
-# }
+provider "docker" {
+  host     = "ssh://root@${module.server.ipv4_address}:22"
+  ssh_opts = ["-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null", "-i", "~/.ssh/id_rsa.darklab"]
+}
+
+module "darkbot" {
+  source              = "../modules/darkbot"
+  configurator_dbname = "staging"
+  consoler_prefix     = ","
+  secrets             = local.secrets
+  tag_version         = "v1.5.1-arm"
+  debug               = false
+}
diff --git a/infra/tf/staging/providers.tf b/infra/tf/staging/providers.tf
@@ -19,8 +19,11 @@ terraform {
   }
 }
 
+data "aws_ssm_parameter" "hetzner" {
+  name = "/terraform/hetzner/production"
+}
 provider "hcloud" {
-  token = local.secrets["HETZNER_TOKEN"]
+  token = data.aws_ssm_parameter.hetzner.value
 }
 
 data "aws_ssm_parameter" "cloudflare_key" {