Prepare for use of GA in multi-site post stack

tamu-edu · Sep 2, 2024 · 65cf30e · 65cf30e
1 parent 830d20c
commit 65cf30e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 231 deletions.
diff --git a/certs.tf b/certs.tf
@@ -8,7 +8,7 @@ locals {
     var.site_settings.top_level_domain == "" || var.deployment != "prod" ? [] : [var.site_settings.top_level_domain],
     var.site_settings.additional_domains == null ? tolist([]) : (var.deployment != "prod" ? tolist([]) : tolist(var.site_settings.additional_domains)),
     # This is for the optional global accelerator
-    var.global_accelerator_source == "" ? [] : [var.global_accelerator_source],
+    try(var.site_settings.global_accelerator, "") == "" ? [] : [var.site_settings.global_accelerator],
     try(var.site_settings.additional_certs, var.additional_certs)
   ))
 

diff --git a/ga.tf b/ga.tf
diff --git a/variables.tf b/variables.tf
@@ -88,17 +88,23 @@ variable "error_response_404_path" {
 #  default     = false
 #}
 
-variable "global_accelerator_source" {
-  description = "The source address for the global accelerator (i.e., tamu.edu). Leave blank to not use a GA"
+variable "global_accelerator" {
+  description = "The FQDN for the global accelerator (i.e., tamu.edu) certificate. Leave blank to not generate a cert"
   type        = string
   default     = ""
 }
 
-variable "global_accelerator_target" {
-  description = "The target address for the global accelerator (i.e., www.tamu.edu). Leave blank to not use a GA"
-  type        = string
-  default     = ""
-}
+#variable "global_accelerator_source" {
+#  description = "The source address for the global accelerator (i.e., tamu.edu). Leave blank to not use a GA"
+#  type        = string
+#  default     = ""
+#}
+#
+#variable "global_accelerator_target" {
+#  description = "The target address for the global accelerator (i.e., www.tamu.edu). Leave blank to not use a GA"
+#  type        = string
+#  default     = ""
+#}
 
 variable "html_ttl" {
   type        = number