diff --git a/terraform/README.md b/terraform/README.md index 8847842..ea82ea6 100644 --- a/terraform/README.md +++ b/terraform/README.md @@ -10,7 +10,7 @@ nix develop --command zsh ### terraform provider docs The following NixOS instances were deployed in DC `lev-1` using terraform: -- `pub-solar-infra-vm-1` +- `flora-6` The Namecheap API was used to create the DNS records for `*.pub.solar`. diff --git a/terraform/lev-1/.envrc b/terraform/lev-1/.envrc new file mode 100644 index 0000000..33f2a7d --- /dev/null +++ b/terraform/lev-1/.envrc @@ -0,0 +1,3 @@ +source_up + +ttp set lev-1-pub_solar diff --git a/terraform/.terraform.lock.hcl b/terraform/lev-1/.terraform.lock.hcl similarity index 100% rename from terraform/.terraform.lock.hcl rename to terraform/lev-1/.terraform.lock.hcl diff --git a/terraform/data.tf b/terraform/lev-1/data.tf similarity index 100% rename from terraform/data.tf rename to terraform/lev-1/data.tf diff --git a/terraform/dns.tf b/terraform/lev-1/dns.tf similarity index 85% rename from terraform/dns.tf rename to terraform/lev-1/dns.tf index 81380c2..b586aba 100644 --- a/terraform/dns.tf +++ b/terraform/lev-1/dns.tf @@ -5,24 +5,29 @@ resource "namecheap_domain_records" "pub-solar" { email_type = "MX" record { - hostname = "infra-1" + hostname = "flora-6" type = "CNAME" - address = "infra-1.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone" + address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone" } record { hostname = "auth" type = "CNAME" - address = "infra-1.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone" + address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone" } record { hostname = "git" type = "CNAME" - address = "infra-1.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone" + address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone" + } + record { + hostname = "obs-portal" + type = "CNAME" + address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone" } record { hostname = "vpn" type = "CNAME" - address = "infra-1.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone" + address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone" } record { hostname = "cache" diff --git a/terraform/instances.tf b/terraform/lev-1/instances.tf similarity index 86% rename from terraform/instances.tf rename to terraform/lev-1/instances.tf index 93d33a4..5ec7983 100644 --- a/terraform/instances.tf +++ b/terraform/lev-1/instances.tf @@ -4,7 +4,7 @@ # https://registry.terraform.io/providers/joyent/triton/latest/docs resource "triton_machine" "pub-solar-infra-vm-1" { - name = "pub-solar-infra-vm-1" + name = "flora-6" image = "${data.triton_image.nixos.id}" package = "bhyve-huge" networks = ["${data.triton_network.public.id}","${data.triton_network.private.id}"] @@ -12,6 +12,6 @@ resource "triton_machine" "pub-solar-infra-vm-1" { firewall_enabled = false cns { - services = ["infra-1"] + services = ["flora-6"] } } diff --git a/terraform/providers.tf b/terraform/lev-1/providers.tf similarity index 100% rename from terraform/providers.tf rename to terraform/lev-1/providers.tf diff --git a/terraform/remote-backend.tf b/terraform/lev-1/remote-backend.tf similarity index 79% rename from terraform/remote-backend.tf rename to terraform/lev-1/remote-backend.tf index 0b514d7..bc9f891 100644 --- a/terraform/remote-backend.tf +++ b/terraform/lev-1/remote-backend.tf @@ -1,7 +1,7 @@ # https://www.terraform.io/language/v1.2.x/settings/backends/manta terraform { backend "manta" { - path = "pub-solar/infra-1" + path = "pub-solar/flora-6" object_name = "terraform.tfstate" } }