cleanup/reorg

terraform/.terraform.lock.hcl

@@ -2,54 +2,48 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.opentofu.org/cloudflare/cloudflare" {
-  version     = "4.52.5"
+  version     = "5.15.0"
-  constraints = "~> 4.0"
+  constraints = "~> 5.0"
   hashes = [
-    "h1:+rfzF+16ZcWZWnTyW/p1HHTzYbPKX8Zt2nIFtR/+f+E=",
+    "h1:EY8mWQO1NTqXuxnZxwVppF7AiLRdx7vRLYk6O7yzgPs=",
-    "zh:1a3400cb38863b2585968d1876706bcfc67a148e1318a1d325c6c7704adc999b",
+    "zh:20a72bdbb28435f11d165b367732369e8f8163100a214e89ad720dae03fafa0c",
-    "zh:4c5062cb9e9da1676f06ae92b8370186d98976cc4c7030d3cd76df12af54282a",
+    "zh:2eabd7a51fd7aafcab9861631d85c895914857e4fcd6fe2dd80bac22e74a1f47",
-    "zh:52110f493b5f0587ef77a1cfd1a67001fd4c617b14c6502d732ab47352bdc2f7",
+    "zh:62828afbc1ba0e0a64bbb7d5d42ae3c2fbbaabb793010b07eba770ba91bae94f",
-    "zh:5aa536f9eaeb43823aaf2aa80e7d39b25ef2b383405ed034aa16a28b446a9238",
+    "zh:6693f1021e52c34a629300fbcd91f8bd4ca386fda3b45aec746b9c200c28a42c",
-    "zh:5cc39459a1c6be8a918f17054e4fbba573825ed5597dcada588fe99614d98a5b",
+    "zh:6873a15454b289e5baecc1d36ce8997266438761386a320753c63f13407f4a6b",
-    "zh:629ae6a7ba298815131da826474d199312d21cec53a4d5ded4fa56a692e6f072",
+    "zh:afbf4e56b3a5e5950b35b02b553313e4a2008415920b23f536682269c64ca549",
-    "zh:719cc7c75dc1d3eb30c22ff5102a017996d9788b948078c7e1c5b3446aeca661",
+    "zh:db367612900bc2e5a01c6a325e4cff9b1b04960ce9de3dd41671dda5a627ca1d",
-    "zh:8698635a3ca04383c1e93b21d6963346bdae54d27177a48e4b1435b7f731731c",
+    "zh:eb7365eafc6160c3b304a9ce6a598e5400a2e779e9e2bd27976df244f79f774f",
-    "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f",
+    "zh:f809ab383cca0a5f83072981c64208cbd7fa67e986a86ee02dd2c82333221e32",
-    "zh:8a9993f1dcadf1dd6ca43b23348abe374605d29945a2fafc07fb3457644e6a54",
-    "zh:b1b9a1e6bcc24d5863a664a411d2dc906373ae7a2399d2d65548ce7377057852",
-    "zh:b270184cdeec277218e84b94cb136fead753da717f9b9dc378e51907f3f00bb0",
-    "zh:dff2bc10071210181726ce270f954995fe42c696e61e2e8f874021fed02521e5",
-    "zh:e8e87b40b6a87dc097b0fdc20d3f725cec0d82abc9cc3755c1f89f8f6e8b0036",
-    "zh:ee964a6573d399a5dd22ce328fb38ca1207797a02248f14b2e4913ee390e7803",
   ]
 }
 
 provider "registry.opentofu.org/dnsimple/dnsimple" {
-  version     = "1.8.0"
+  version     = "2.0.0"
-  constraints = "1.8.0"
+  constraints = "~> 2.0"
   hashes = [
-    "h1:uxMck1OicFKHnTF6Fwe8es07LHE3k3nS5B7fzN99/fc=",
+    "h1:wWsupXlmlShs8m4C2dTaNcYTxFJtDipftKWlXk+jX1U=",
-    "zh:0852fd9523268b30fb637a03a0cb6d6a5878cbbf7e0e4219615c9ba073fbdf17",
+    "zh:0fb015799f6d37323cdc2776eed67657721df24311bf5b458f7fcce65ec66dea",
-    "zh:0ac43193082dd467abad4937b0abb97ea349205726fc450cb3a94dc0db6e9a49",
+    "zh:533cd0f6edd4ed6610b324b39aa3abb5e84293a3aaa176042826f17f10a20557",
-    "zh:10e4aad54c2d6cbd9328a1661d72a978357743eda7099a3f120a497119be4ff1",
+    "zh:77d13ff083eeeb408822e885934925b9010462ca7601d35f2a1c2b0d5faf2f52",
-    "zh:211d481935dec36903928c51f5f4f15d98313f6d50649ea064bc20a4d6541678",
+    "zh:9be63f37c98050a30e43066805ac70db3e3ddfcf03607c9c8d8d13ebd3503648",
-    "zh:2705b5ebac4219449f9126cc19fa982cf0644e5df60d3d5254131d2e2d676afd",
+    "zh:a66a61ab90840b5ae9513f302f76e2348acb8bca50cb702e1f6fbcd24b1111fb",
-    "zh:27f0df80af6652e96f85a0856daa571af495d2119ab126199d6d5ab53f6eb887",
+    "zh:b65d2f77f20a9587f169aaeccd8e12f07a713294fd687043ff041538c5da5cf9",
-    "zh:27fbb2fb69291a660d8e99ba960f01051b7fc28658f7932772ce7e80a42bd6e9",
+    "zh:c24faaefb7f87050f1dfbf6c7a9a522df07ab97e9ce73d7fd20bce761d092076",
-    "zh:3ecf20ead1f044f08ae9e411c9341d47319eb6af5d6543b58f2f6932c6b288b0",
+    "zh:d0072167c5f52cd63e245d6b136a8e62979c0b0979fbea5a07015d5bfb6e7191",
-    "zh:635055f0af3eb27d30801aeead51d8b960c386f369a378fad7146350ec6b4d68",
+    "zh:d07dee2322cf12ffc439059f7f3a58a5d740fe7ad934f96b84b0be3257ee31cb",
-    "zh:7ca26f64221a9c6634a02296e30a87e3fffed1144ac57e0ae9a86a448f42d4ca",
+    "zh:d0c898dcc7d51427348d641474a74521c029d2cd9713f262e404f5fb36f4c3a5",
-    "zh:895e0732da00942b2eb13c78673a9c9268e87e92a225999cddf2d13b823f3295",
+    "zh:d9322e1a3dba21316713ada4b8de6c4090ca6b76b418ef55b85dbe7c0a578391",
-    "zh:b3806e5b687faf97ad8cb2a23e105729059693ae07a229fecef52da5279d7bd1",
+    "zh:e0e0b5f07293ff2c0ddb1c561dcb430924897022995006c4bb71719cf3995d9d",
-    "zh:c3c284a54aab3ddea2dba140af4a707ce077c9c2d9d34556902afdb25fe6ca8e",
+    "zh:e4eb3deac11f7798ea991fd044aec6a23592cbd887a7f3d1d415e8f553ba7b39",
-    "zh:d2539f2cc5960a55a53eaaa90248abfb3167275e34af7e93735ec4571eb879eb",
+    "zh:f1d307fe43f3a8be6a97111dbe025ccd0bb4a5c8dadd54abc48adec8701336b1",
     "zh:f809ab383cca0a5f83072981c64208cbd7fa67e986a86ee02dd2c82333221e32",
   ]
 }
 
 provider "registry.opentofu.org/kyswtn/porkbun" {
   version     = "0.1.3"
-  constraints = "0.1.3"
+  constraints = "~> 0.1"
   hashes = [
     "h1:9PQILbIAiWdXCl+alkJ66h0uPm8wMgKfFaowJ2W3GB8=",
     "zh:162faaf9378691e126a02c913df206a04d9529a24dfb9db8de306932e01666ec",
@@ -72,7 +66,7 @@ provider "registry.opentofu.org/kyswtn/porkbun" {
 
 provider "registry.opentofu.org/pan-net/powerdns" {
   version     = "1.5.0"
-  constraints = "1.5.0"
+  constraints = "~> 1.5"
   hashes = [
     "h1:oMzrqQGFY88Cwx06YkFHP6io3jow/22FRZkeK0UZtGY=",
     "zh:02d1a87c28635779f66d1dcf165b5f16530f809deb6c71c35c3e58d715a88bf4",
@@ -92,25 +86,25 @@ provider "registry.opentofu.org/pan-net/powerdns" {
 }
 
 provider "registry.opentofu.org/vultr/vultr" {
-  version     = "2.27.1"
+  version     = "2.28.0"
-  constraints = "~> 2.0"
+  constraints = "~> 2.28"
   hashes = [
-    "h1:03veypY7WtdR3vHzy2/j6M0Zmuo7IyfwkqqqM6hLjWw=",
+    "h1:YLj0Kd8/HXNJJWMJ2Uq46r97SePDlGsLjor3Giqr3l0=",
-    "zh:258d785a466690a8fb4e9b66ded5bcfe2278f9f5405a2378c0b4f7c4d36e0c8a",
+    "zh:081b2517a23293849982d756200ccc5e3e6414b13364ff69433cfc9231f512c5",
-    "zh:2e41bdbde0dfe3c2efad5a758242afb5f4ffd2a4011c0116273f261153350416",
+    "zh:1c347a05b0be1b6756a8c2e166520fb39eaa2c3f44e57c2702aa58bd8b65bcef",
-    "zh:337f57803fc981dfbfa3cc33a1da815d16b32f410ee5ebf3ca23e3f99a5c2fbd",
+    "zh:204eb6826ae12b56991cab3731ba08e13d87c7fe31e246df59342570fb616df0",
-    "zh:4c3147de502d1189f6c5b344fab0529ecfc72a1c55c97813610d9e165c409c36",
+    "zh:60fccc6b46623eb4c4f27590dcc12874ca50cbcc6d73d7c117ef54a1e8de5cb2",
-    "zh:5ab1c11d5db6752e5f191bd5a353445beb3644d8abcfe69235cc72ae735827bf",
+    "zh:623fccedab77a40ea1e48ab90dc13edb85d0e57c12ebb2dda63e7454fd08dd81",
-    "zh:5dbae73ff2a059ba1bbcf8c76ccf877bb44c53028ae407b3bdf00c6be9c50426",
+    "zh:6cb057b6829f9654a77f5f4e9c97193180ca956d0f8760b3d484f521701aa814",
-    "zh:6b17163945bddb89d24ef5cb9af1efb9d189add0a75f6621cf1a2b86ad156e44",
+    "zh:8c7192c66096b895a944913d7414f541cd0b300052df86856ce408d50bec3f68",
-    "zh:8aee9d6ae2a087bdb925b527c702fd3dae66e82cf18abecce128e0ba483064a8",
+    "zh:97f8cc46937237a3272aa30799ddab9972cae804ec8e7fcc850f0b2dd7ab2884",
-    "zh:914453131253e1a68b2a7f0241abd181ddd2ddc9b2a4487f4710121f33a1cf29",
+    "zh:9848294291468e520a0a8032079afd747ea7157eba614b3b18c89f226a25f93f",
-    "zh:9dd846e7c06f0fba3705dc113b358a5d735c53b624c13561cf2e79ffe0d65d1a",
+    "zh:a2f971d3a30d7e3952f8439a94f880f739b03645bc617d7e3acc3771da426148",
-    "zh:beae990bf06a283255a2448b600bdc5b341fa0ce4f2b236046f73eb227053f7e",
+    "zh:ad5d4fd1f24d23f51c8bd1f45d0be9edefba9175702bccff5fa9007247c6e48f",
-    "zh:c9acfb9285eb51fbdaa8de1b56b6816e233b86124442e9f49982b2b8ae8de246",
+    "zh:b65aedaaaf75898d61e2c7d6909011103d716f7df5da13d355033f749626f03c",
-    "zh:ea9f66cd35f7422ec2c29d09160d6621063e3c3fa64f24a5210c21413c7d62d3",
+    "zh:d9f9bd59d911bc7eb2a08bbeb5f4a04db1e7afcf0ebf18fab16a9c8a6133af16",
-    "zh:eaf35df48d717879da8b0a962dea13e7d1926f016a27e0f32c11272d68fbac5d",
+    "zh:e3a1cd0022c4d48706ee2c5cf4d88f1d7684b24070225fbb1b21e61ae19dcf54",
-    "zh:f1ee0ad592060cc9d69270a10b44f508414c029ce5859b760e59c11a1b3c0d43",
+    "zh:f1bbef24eb56b38f3f54673087dd2de10ca871df1f8752e7630bbd11bb00dcc8",
-    "zh:ff6ffae0eed9953dd68939f484460a58670c881fb9b7d828352b142dced662f7",
+    "zh:f6559ec45a1aee36f431e1f42a09fe7a6b0751c4c1036fe56edfc174478548da",
   ]
 }

terraform/main.tf

@@ -2,23 +2,23 @@ terraform {
   required_providers {
     dnsimple = {
       source  = "dnsimple/dnsimple"
-      version = "1.8.0"
+      version = "~> 2.0"
     }
     porkbun = {
       source  = "kyswtn/porkbun"
-      version = "0.1.3"
+      version = "~> 0.1"
     }
     powerdns = {
       source  = "pan-net/powerdns"
-      version = "1.5.0"
+      version = "~> 1.5"
     }
     vultr = {
       source  = "vultr/vultr"
-      version = "~> 2.0"
+      version = "~> 2.28"
     }
     cloudflare = {
       source  = "cloudflare/cloudflare"
-      version = "~> 4.0"
+      version = "~> 5.0"
     }
     # proxmox = {
     #   source  = "bpg/proxmox"
@@ -33,8 +33,8 @@ provider "dnsimple" {
 }
 
 provider "porkbun" {
-  api_key        = var.prokbun_api_key
+  api_key        = var.porkbun_api_key
-  secret_api_key = var.prokbun_secret_api_key
+  secret_api_key = var.porkbun_secret_api_key
 }
 
 # provider "powerdns" {

terraform/terraform.tfvars

@@ -1,2 +1,10 @@
+# Proxmox tokens
 token_secret = "1cdd961f-5ee7-4110-8806-e72357a2226f"
 token_id     = "terraform@pve!terraform-token"
+
+# DNS Provider secrets
+dnsimple_token         = "dnsimple_a_sRmKiuHrxR2UiMHf0NREqAtgfELyRVAI"
+porkbun_api_key        = "pk1_5f321ff82ce0c085e67f9569db48976d838f302bc15b88292373e4b6b9891f17"
+porkbun_secret_api_key = "sk1_854fd74c8221bceaec27cf17edf3402b074e67447befe1363cf0247b620c82c5"
+pdns_api_key           = "q4zBRoR72gOIfrgdskASMKqyNNo2mf"
+pdns_vultr_api_key     = "eyyMkv7dpDE0gQz1N2FeyUWGRa9FBHGcqcdSCMaaoe"

terraform/variables.tf

@@ -147,8 +147,81 @@ variable "ssh_public_key" {
   default     = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHLyVSEEAEbGZZqwPwEup0XrlTpu3x3iF9ExvvQPA4xN graham@mcintire.me"
 }
 
-variable "pdns_vultr_api_key" {
+# DNS Provider Variables
+variable "dnsimple_token" {
+  description = "DNSimple API token"
+  type        = string
+  sensitive   = true
+}
+
+variable "dnsimple_account" {
+  description = "DNSimple account ID"
+  type        = string
+  default     = "143471"
+}
+
+variable "porkbun_api_key" {
+  description = "Porkbun API key"
+  type        = string
+  sensitive   = true
+}
+
+variable "porkbun_secret_api_key" {
+  description = "Porkbun secret API key"
+  type        = string
+  sensitive   = true
+}
+
+variable "pdns_api_key" {
   description = "PowerDNS API key"
   type        = string
-  default     = "eyyMkv7dpDE0gQz1N2FeyUWGRa9FBHGcqcdSCMaaoe"
+  sensitive   = true
+}
+
+variable "pdns_server_url" {
+  description = "PowerDNS server URL"
+  type        = string
+  default     = "http://ns1.vntx.net:8081"
+}
+
+variable "pdns_vultr_api_key" {
+  description = "PowerDNS Vultr API key"
+  type        = string
+  sensitive   = true
+}
+
+# Legacy Proxmox Variables (from vars.tf)
+variable "proxmox_host" {
+  description = "Proxmox host for VM deployment"
+  type        = string
+  default     = "vm2-380"
+}
+
+variable "template_name" {
+  description = "VM template name"
+  type        = string
+  default     = "ubuntu"
+}
+
+variable "nic_name" {
+  description = "Network interface name"
+  type        = string
+  default     = "vmbr0"
+}
+
+variable "api_url" {
+  description = "Proxmox API URL (legacy)"
+  type        = string
+  default     = "https://10.0.0.2:8006/api2/json"
+}
+
+variable "token_secret" {
+  description = "Proxmox token secret"
+  type        = string
+  sensitive   = true
+}
+
+variable "token_id" {
+  description = "Proxmox token ID"
+  type        = string
 }

terraform/vars.tf

@@ -1,68 +0,0 @@
-variable "dnsimple_token" {
-  type    = string
-  default = "dnsimple_a_sRmKiuHrxR2UiMHf0NREqAtgfELyRVAI"
-}
-
-variable "dnsimple_account" {
-  type    = string
-  default = "143471"
-}
-
-variable "prokbun_api_key" {
-  type    = string
-  default = "pk1_5f321ff82ce0c085e67f9569db48976d838f302bc15b88292373e4b6b9891f17"
-}
-
-variable "prokbun_secret_api_key" {
-  type    = string
-  default = "sk1_854fd74c8221bceaec27cf17edf3402b074e67447befe1363cf0247b620c82c5"
-}
-
-variable "pdns_api_key" {
-  type    = string
-  default = "q4zBRoR72gOIfrgdskASMKqyNNo2mf"
-}
-
-variable "pdns_server_url" {
-  type    = string
-  default = "http://ns1.vntx.net:8081"
-}
-
-
-#Set your public SSH key here
-variable "ssh_key" {
-  type    = string
-  default = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHLyVSEEAEbGZZqwPwEup0XrlTpu3x3iF9ExvvQPA4xN graham@mcintire.me"
-}
-#Establish which Proxmox host you'd like to spin a VM up on
-variable "proxmox_host" {
-  type    = string
-  default = "vm2-380"
-}
-#Specify which template name you'd like to use
-variable "template_name" {
-  type    = string
-  default = "ubuntu"
-}
-#Establish which nic you would like to utilize
-variable "nic_name" {
-  type    = string
-  default = "vmbr0"
-}
-#Establish the VLAN you'd like to use
-# variable "vlan_num" {
-#   default = "place_vlan_number_here"
-# }
-#Provide the url of the host you would like the API to communicate on.
-#It is safe to default to setting this as the URL for what you used
-#as your `proxmox_host`, although they can be different
-variable "api_url" {
-  type    = string
-  default = "https://10.0.0.2:8006/api2/json"
-}
-#Blank var for use by terraform.tfvars
-variable "token_secret" {
-}
-#Blank var for use by terraform.tfvars
-variable "token_id" {
-}