use generic ZONE IDs

6 files changed, 35 insertions, 35 deletions

diff --git a/org-buetow-ecs/audiobookshelfservice.tf b/org-buetow-ecs/audiobookshelfservice.tf
index 777e514..bf13515 100644
--- a/org-buetow-ecs/audiobookshelfservice.tf
+++ b/org-buetow-ecs/audiobookshelfservice.tf
@@ -1,6 +1,6 @@
 resource "aws_route53_record" "a_record_audiobookshelf" {
-  zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id
-  name    = "audiobookshelf.buetow.cloud."
+  zone_id = data.terraform_remote_state.base.outputs.zone_id
+  name    = "audiobookshelf.${data.terraform_remote_state.base.outputs.zone_id}."
   type    = "A"
 
   alias {
@@ -11,8 +11,8 @@ resource "aws_route53_record" "a_record_audiobookshelf" {
 }
 
 resource "aws_route53_record" "aaaa_record_audiobookshelf" {
-  zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id
-  name    = "audiobookshelf.buetow.cloud."
+  zone_id = data.terraform_remote_state.base.outputs.zone_id
+  name    = "audiobookshelf.${data.terraform_remote_state.base.outputs.zone_id}."
   type    = "AAAA"
 
   alias {
@@ -171,7 +171,7 @@ resource "aws_lb_listener_rule" "audiobookshelf_https_listener_rule" {
 
   condition {
     host_header {
-      values = ["audiobookshelf.buetow.cloud"]
+      values = ["audiobookshelf.${data.terraform_remote_state.base.outputs.zone_id}"]
     }
   }
 
diff --git a/org-buetow-ecs/bagservice.tf b/org-buetow-ecs/bagservice.tf
index c6c6061..4d06988 100644
--- a/org-buetow-ecs/bagservice.tf
+++ b/org-buetow-ecs/bagservice.tf
@@ -1,6 +1,6 @@
 resource "aws_route53_record" "a_record_bag" {
-  zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id
-  name    = "bag.buetow.cloud."
+  zone_id = data.terraform_remote_state.base.outputs.zone_id
+  name    = "bag.${data.terraform_remote_state.base.outputs.zone_id}."
   type    = "A"
 
   alias {
@@ -11,8 +11,8 @@ resource "aws_route53_record" "a_record_bag" {
 }
 
 resource "aws_route53_record" "aaaa_record_bag" {
-  zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id
-  name    = "bag.buetow.cloud."
+  zone_id = data.terraform_remote_state.base.outputs.zone_id
+  name    = "bag.${data.terraform_remote_state.base.outputs.zone_id}."
   type    = "AAAA"
 
   alias {
@@ -60,7 +60,7 @@ resource "aws_ecs_task_definition" "bag" {
     environment = [
       {
         name  = "SYMFONY__ENV__DOMAIN_NAME",
-        value = "https://bag.buetow.cloud"
+        value = "https://bag.${data.terraform_remote_state.base.outputs.zone_id}"
       }
     ],
     mountPoints = [
@@ -150,7 +150,7 @@ resource "aws_lb_listener_rule" "bag_https_listener_rule" {
 
   condition {
     host_header {
-      values = ["bag.buetow.cloud"]
+      values = ["bag.${data.terraform_remote_state.base.outputs.zone_id}"]
     }
   }
 
diff --git a/org-buetow-ecs/fluxservice.tf b/org-buetow-ecs/fluxservice.tf
index d6ea931..d1f10e0 100644
--- a/org-buetow-ecs/fluxservice.tf
+++ b/org-buetow-ecs/fluxservice.tf
@@ -1,6 +1,6 @@
 resource "aws_route53_record" "a_record_flux" {
-  zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id
-  name    = "flux.buetow.cloud."
+  zone_id = data.terraform_remote_state.base.outputs.zone_id
+  name    = "flux.${data.terraform_remote_state.base.outputs.zone_id}."
   type    = "A"
 
   alias {
@@ -11,8 +11,8 @@ resource "aws_route53_record" "a_record_flux" {
 }
 
 resource "aws_route53_record" "aaaa_record_flux" {
-  zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id
-  name    = "flux.buetow.cloud."
+  zone_id = data.terraform_remote_state.base.outputs.zone_id
+  name    = "flux.${data.terraform_remote_state.base.outputs.zone_id}."
   type    = "AAAA"
 
   alias {
@@ -146,7 +146,7 @@ resource "aws_lb_listener_rule" "flux_https_listener_rule" {
 
   condition {
     host_header {
-      values = ["flux.buetow.cloud"]
+      values = ["flux.${data.terraform_remote_state.base.outputs.zone_id}"]
     }
   }
 }
diff --git a/org-buetow-ecs/nginxservice.tf b/org-buetow-ecs/nginxservice.tf
index 01f5ec2..6c36d45 100644
--- a/org-buetow-ecs/nginxservice.tf
+++ b/org-buetow-ecs/nginxservice.tf
@@ -1,6 +1,6 @@
 #resource "aws_route53_record" "a_record_nginx" {
-#  zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id
-#  name    = "nginx.buetow.cloud."
+#  zone_id = data.terraform_remote_state.base.outputs.zone_id
+#  name    = "nginx.${data.terraform_remote_state.base.outputs.zone_id}."
 #  type    = "A"
 #
 #  alias {
@@ -11,8 +11,8 @@
 #}
 #
 #resource "aws_route53_record" "aaaa_record_nginx" {
-#  zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id
-#  name    = "nginx.buetow.cloud."
+#  zone_id = data.terraform_remote_state.base.outputs.zone_id
+#  name    = "nginx.${data.terraform_remote_state.base.outputs.zone_id}."
 #  type    = "AAAA"
 #
 #  alias {
@@ -114,7 +114,7 @@
 #
 #  condition {
 #    host_header {
-#      values = ["nginx.buetow.cloud"]
+#      values = ["nginx.${data.terraform_remote_state.base.outputs.zone_id}"]
 #    }
 #  }
 #
diff --git a/org-buetow-ecs/syncthingservice.tf b/org-buetow-ecs/syncthingservice.tf
index 5d0758e..655bd89 100644
--- a/org-buetow-ecs/syncthingservice.tf
+++ b/org-buetow-ecs/syncthingservice.tf
@@ -45,8 +45,8 @@ resource "aws_lb_target_group" "syncthing_data_tcp" {
 }
 
 resource "aws_route53_record" "a_record_syncthing" {
-  zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id
-  name    = "syncthing.buetow.cloud."
+  zone_id = data.terraform_remote_state.base.outputs.zone_id
+  name    = "syncthing.${data.terraform_remote_state.base.outputs.zone_id}."
   type    = "A"
 
   alias {
@@ -57,8 +57,8 @@ resource "aws_route53_record" "a_record_syncthing" {
 }
 
 resource "aws_route53_record" "aaaa_record_syncthing" {
-  zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id
-  name    = "syncthing.buetow.cloud."
+  zone_id = data.terraform_remote_state.base.outputs.zone_id
+  name    = "syncthing.${data.terraform_remote_state.base.outputs.zone_id}."
   type    = "AAAA"
 
   alias {
@@ -102,7 +102,7 @@ resource "aws_lb_listener_rule" "syncthing_ui_https_listener_rule" {
 
   condition {
     host_header {
-      values = ["syncthing.buetow.cloud"]
+      values = ["syncthing.${data.terraform_remote_state.base.outputs.zone_id}"]
     }
   }
 
@@ -113,8 +113,8 @@ resource "aws_lb_listener_rule" "syncthing_ui_https_listener_rule" {
 
 
 resource "aws_route53_record" "a_record_syncthing_data" {
-  zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id
-  name    = "syncthing-data.buetow.cloud."
+  zone_id = data.terraform_remote_state.base.outputs.zone_id
+  name    = "syncthing-data.${data.terraform_remote_state.base.outputs.zone_id}."
   type    = "A"
 
   alias {
@@ -125,8 +125,8 @@ resource "aws_route53_record" "a_record_syncthing_data" {
 }
 
 resource "aws_route53_record" "aaaa_record_syncthing_data" {
-  zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id
-  name    = "syncthing-data.buetow.cloud."
+  zone_id = data.terraform_remote_state.base.outputs.zone_id
+  name    = "syncthing-data.${data.terraform_remote_state.base.outputs.zone_id}."
   type    = "AAAA"
 
   alias {
diff --git a/org-buetow-ecs/vaultservice.tf b/org-buetow-ecs/vaultservice.tf
index 0405eb6..659761f 100644
--- a/org-buetow-ecs/vaultservice.tf
+++ b/org-buetow-ecs/vaultservice.tf
@@ -1,6 +1,6 @@
 #resource "aws_route53_record" "a_record_vault" {
-#  zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id
-#  name    = "vault.buetow.cloud."
+#  zone_id = data.terraform_remote_state.base.outputs.zone_id
+#  name    = "vault.${data.terraform_remote_state.base.outputs.zone_id}."
 #  type    = "A"
 #
 #  alias {
@@ -11,8 +11,8 @@
 #}
 #
 #resource "aws_route53_record" "aaaa_record_vault" {
-#  zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id
-#  name    = "vault.buetow.cloud."
+#  zone_id = data.terraform_remote_state.base.outputs.zone_id
+#  name    = "vault.${data.terraform_remote_state.base.outputs.zone_id}."
 #  type    = "AAAA"
 #
 #  alias {
@@ -131,7 +131,7 @@
 #
 #  condition {
 #    host_header {
-#      values = ["vault.buetow.cloud"]
+#      values = ["vault.${data.terraform_remote_state.base.outputs.zone_id}"]
 #    }
 #  }
 #