diff --git a/frontend/public/locales/en/common.json b/frontend/public/locales/en/common.json index fc0edfa53..4779b6586 100644 --- a/frontend/public/locales/en/common.json +++ b/frontend/public/locales/en/common.json @@ -1,6 +1,6 @@ { "Index": { - "page_title": "beta.grants.gov", + "page_title": "simpler.grants.gov", "meta_description": "A oneā€‘stop shop for all federal discretionary funding to make it easy for you to discover, understand, and apply for opportunities.", "alert_title": "Beta.grants.gov is a work in progress.", "alert": "To search for funding opportunities and apply, go to www.grants.gov.", diff --git a/infra/frontend/service/dev.tfvars b/infra/frontend/service/dev.tfvars index 64c619dcd..b6ab7075f 100644 --- a/infra/frontend/service/dev.tfvars +++ b/infra/frontend/service/dev.tfvars @@ -2,3 +2,4 @@ environment_name = "dev" tfstate_bucket = "grants-equity-315341936575-us-east-1-tf" tfstate_key = "infra/frontend/service/dev.tfstate" region = "us-east-1" +domain = "beta.grants.gov" diff --git a/infra/frontend/service/example.tfvars b/infra/frontend/service/example.tfvars index d2d79d550..1509947bd 100644 --- a/infra/frontend/service/example.tfvars +++ b/infra/frontend/service/example.tfvars @@ -2,3 +2,4 @@ environment_name = "" tfstate_bucket = "" tfstate_key = "" region = "" +domain = "" diff --git a/infra/frontend/service/main.tf b/infra/frontend/service/main.tf index 6e9617b58..9b58a9024 100644 --- a/infra/frontend/service/main.tf +++ b/infra/frontend/service/main.tf @@ -89,8 +89,9 @@ data "aws_ssm_parameter" "incident_management_service_integration_url" { name = local.incident_management_service_integration_config.integration_url_param_name } -data "aws_acm_certificate" "frontend_cert" { - domain = "beta.grants.gov" +data "aws_acm_certificate" "cert" { + count = var.domain != null ? 1 : 0 + domain = var.domain } output "environment_name" { @@ -104,9 +105,7 @@ module "service" { vpc_id = data.aws_vpc.default.id subnet_ids = data.aws_subnets.default.ids enable_autoscaling = module.app_config.enable_autoscaling - # TODO: Reroute SSL to production environment - # To temporarily avoid issues in production & Terratest: Check if environment is "dev" and workspace is "default" - cert_arn = var.environment_name == "dev" && terraform.workspace == "default" ? data.aws_acm_certificate.frontend_cert.arn : null + cert_arn = var.domain != null ? data.aws_acm_certificate.cert[0].arn : null db_vars = module.app_config.has_database ? { security_group_ids = data.aws_rds_cluster.db_cluster[0].vpc_security_group_ids diff --git a/infra/frontend/service/prod.tfvars b/infra/frontend/service/prod.tfvars index 8f514d27a..3983c4344 100644 --- a/infra/frontend/service/prod.tfvars +++ b/infra/frontend/service/prod.tfvars @@ -2,3 +2,4 @@ environment_name = "prod" tfstate_bucket = "grants-equity-315341936575-us-east-1-tf" tfstate_key = "infra/frontend/service/prod.tfstate" region = "us-east-1" +domain = "simpler.grants.gov" diff --git a/infra/frontend/service/variables.tf b/infra/frontend/service/variables.tf index 19a5f312f..6e8f548c7 100644 --- a/infra/frontend/service/variables.tf +++ b/infra/frontend/service/variables.tf @@ -8,3 +8,9 @@ variable "image_tag" { description = "image tag to deploy to the environment" default = null } + +variable "domain" { + type = string + description = "DNS domain of the website managed by HHS" + default = null +}