diff --git a/terraform/custom_domains/environment_domains/config/ccbl_preproduction.tfvars.json b/terraform/custom_domains/environment_domains/config/ccbl_preproduction.tfvars.json index 612fa4b9..8fb36d57 100644 --- a/terraform/custom_domains/environment_domains/config/ccbl_preproduction.tfvars.json +++ b/terraform/custom_domains/environment_domains/config/ccbl_preproduction.tfvars.json @@ -1,5 +1,4 @@ { - "enable_alerting": false, "hosted_zone": { "check-the-childrens-barred-list.education.gov.uk": { "front_door_name": "s189p01-ccbl-edu-domains-fd", @@ -8,7 +7,6 @@ "cached_paths": ["/assets/*"], "environment_short": "pp", "origin_hostname": "check-childrens-barred-list-preproduction.test.teacherservices.cloud", - "null_host_header": true, "cnames": {} } } diff --git a/terraform/custom_domains/environment_domains/config/ccbl_production.tfvars.json b/terraform/custom_domains/environment_domains/config/ccbl_production.tfvars.json index cd72b700..69675c19 100644 --- a/terraform/custom_domains/environment_domains/config/ccbl_production.tfvars.json +++ b/terraform/custom_domains/environment_domains/config/ccbl_production.tfvars.json @@ -1,15 +1,19 @@ { - "enable_alerting": false, "hosted_zone": { "check-the-childrens-barred-list.education.gov.uk": { "front_door_name": "s189p01-ccbl-edu-domains-fd", "resource_group_name": "s189p01-ccbldomains-rg", - "domains": ["apex"], + "domains": ["apex", "www"], "cached_paths": ["/assets/*"], "environment_short": "pd", "origin_hostname": "check-childrens-barred-list-production.teacherservices.cloud", - "null_host_header": true, - "cnames": {} + "cnames": {}, + "redirect_rules": [ + { + "from-domain": "www", + "to-domain": "check-the-childrens-barred-list.education.gov.uk" + } + ] } } } diff --git a/terraform/custom_domains/environment_domains/config/ccbl_test.tfvars.json b/terraform/custom_domains/environment_domains/config/ccbl_test.tfvars.json index f854cf47..37072c63 100644 --- a/terraform/custom_domains/environment_domains/config/ccbl_test.tfvars.json +++ b/terraform/custom_domains/environment_domains/config/ccbl_test.tfvars.json @@ -1,5 +1,4 @@ { - "enable_alerting": false, "hosted_zone": { "check-the-childrens-barred-list.education.gov.uk": { "front_door_name": "s189p01-ccbl-edu-domains-fd", @@ -8,7 +7,6 @@ "cached_paths": ["/assets/*"], "environment_short": "test", "origin_hostname": "check-childrens-barred-list-test.test.teacherservices.cloud", - "null_host_header": true, "cnames": {} } } diff --git a/terraform/custom_domains/environment_domains/main.tf b/terraform/custom_domains/environment_domains/main.tf index 58cc076b..f7e11e3a 100644 --- a/terraform/custom_domains/environment_domains/main.tf +++ b/terraform/custom_domains/environment_domains/main.tf @@ -8,8 +8,9 @@ module "domains" { domains = each.value.domains environment = each.value.environment_short host_name = each.value.origin_hostname - null_host_header = try(each.value.null_host_header, false) + null_host_header = true cached_paths = try(each.value.cached_paths, []) + redirect_rules = try(each.value.redirect_rules, null) } # Takes values from hosted_zone.domain_name.cnames (or txt_records, a-records). Use for domains which are not associated with front door.