merge into main

dns/dns-prod-1/terraform/apps.tf

@@ -1,8 +1,10 @@
+# -- databases
+
 resource "dns_a_record_set" "db_prod_1" {
   zone = "home.clcreative.de."
   name = "db-prod-1"
   addresses = [
     "10.20.0.3"
   ]
   ttl = 3600
-}
+}

dns/dns-prod-1/terraform/infra.tf

@@ -1,20 +1,4 @@
-resource "dns_a_record_set" "fw_demo_1" {
-  zone = "home.clcreative.de."
-  name = "fw-demo-1"
-  addresses = [
-    "10.20.3.2"
-  ]
-  ttl = 3600
-}
-
-resource "dns_a_record_set" "fw_demo_2" {
-  zone = "home.clcreative.de."
-  name = "fw-demo-2"
-  addresses = [
-    "10.20.3.3"
-  ]
-  ttl = 3600
-}
+# -- firewalls
 
 resource "dns_a_record_set" "fw_prod_1" {
   zone = "home.clcreative.de."
@@ -25,6 +9,8 @@ resource "dns_a_record_set" "fw_prod_1" {
   ttl = 3600
 }
 
+# -- proxmox servers
+
 resource "dns_a_record_set" "prx_prod_1" {
   zone = "home.clcreative.de."
   name = "prx-prod-1"
@@ -52,6 +38,8 @@ resource "dns_a_record_set" "pre_cluster_1" {
   ttl = 3600
 }
 
+# -- nas
+
 resource "dns_a_record_set" "nas_prod_1" {
   zone = "home.clcreative.de."
   name = "nas-prod-1"
@@ -61,6 +49,17 @@ resource "dns_a_record_set" "nas_prod_1" {
   ttl = 3600
 }
 
+resource "dns_a_record_set" "nas_prod_2" {
+  zone = "home.clcreative.de."
+  name = "nas-prod-2"
+  addresses = [
+    "10.20.0.7"
+  ]
+  ttl = 3600
+}
+
+# -- switches
+
 resource "dns_a_record_set" "sw_prod_1" {
   zone = "home.clcreative.de."
   name = "sw-prod-1"

dns/dns-prod-1/terraform/kubernetes.tf

@@ -52,15 +52,6 @@ resource "dns_a_record_set" "kube_prod_1_lb_wildcard" {
   ttl = 3600
 }
 
-resource "dns_a_record_set" "nas_prod_1_lb_wildcard" {
-  zone = "home.clcreative.de."
-  name = "*.nas-prod-1"
-  addresses = [
-    "10.20.2.3"
-  ]
-  ttl = 3600
-}
-
 # --- kube-prod-2
 
 resource "dns_a_record_set" "kube_prod_2_lb" {

dns/dns-prod-1/terraform/server.tf

@@ -68,19 +68,13 @@ resource "dns_a_record_set" "srv_prod_7_wildcard" {
   ttl       = 3600
 }
 
-# ---
-
-
 resource "dns_a_record_set" "srv_prod_8" {
   zone      = "home.clcreative.de."
   name      = "srv-prod-8"
   addresses = ["10.20.0.19"]
   ttl       = 3600
 }
 
-# -- kube prod 2
-
-
 resource "dns_a_record_set" "srv_prod_9" {
   zone      = "home.clcreative.de."
   name      = "srv-prod-9"
@@ -96,14 +90,15 @@ resource "dns_a_record_set" "srv_prod_10" {
   ttl       = 3600
 }
 
-
 resource "dns_a_record_set" "srv_prod_11" {
   zone      = "home.clcreative.de."
   name      = "srv-prod-11"
   addresses = ["10.20.21.13"]
   ttl       = 3600
 }
 
+# -- testing servers
+
 resource "dns_a_record_set" "srv_test_1" {
   zone      = "home.clcreative.de."
   name      = "srv-test-1"
@@ -118,6 +113,7 @@ resource "dns_a_record_set" "srv_test_2" {
   ttl       = 3600
 }
 
+# -- demo servers
 
 resource "dns_a_record_set" "srv_demo_1" {
   zone      = "home.clcreative.de."
@@ -153,38 +149,3 @@ resource "dns_a_record_set" "srv_demo_4" {
   addresses = ["10.20.3.6"]
   ttl       = 3600
 }
-
-resource "dns_a_record_set" "srv_demo_5" {
-  zone      = "home.clcreative.de."
-  name      = "srv-demo-5"
-  addresses = ["10.20.3.7"]
-  ttl       = 3600
-}
-
-resource "dns_a_record_set" "srv_demo_6" {
-  zone      = "home.clcreative.de."
-  name      = "srv-demo-6"
-  addresses = ["10.20.3.8"]
-  ttl       = 3600
-}
-
-resource "dns_a_record_set" "srv_demo_7" {
-  zone      = "home.clcreative.de."
-  name      = "srv-demo-7"
-  addresses = ["10.20.3.9"]
-  ttl       = 3600
-}
-
-resource "dns_a_record_set" "win_demo_1" {
-  zone      = "home.clcreative.de."
-  name      = "win-demo-1"
-  addresses = ["10.20.3.10"]
-  ttl       = 3600
-}
-
-resource "dns_a_record_set" "linux_demo_1" {
-  zone      = "home.clcreative.de."
-  name      = "linux-demo-1"
-  addresses = ["10.20.3.11"]
-  ttl       = 3600
-}