Add redirect to new domain

DFE-Digital · Jul 17, 2024 · 682841a · 682841a
1 parent 5ec72d4
commit 682841a
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 24 deletions.
diff --git a/terraform/custom_domains/environment_domains/.terraform.lock.hcl b/terraform/custom_domains/environment_domains/.terraform.lock.hcl
diff --git a/terraform/custom_domains/environment_domains/main.tf b/terraform/custom_domains/environment_domains/main.tf
@@ -12,6 +12,7 @@ module "domains" {
   null_host_header      = try(each.value.null_host_header, false)
   cached_paths          = try(each.value.cached_paths, [])
   exclude_cnames        = try(each.value.exclude_cnames, [])
+  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.

diff --git a/...rm/custom_domains/environment_domains/workspace_variables/find_production_aks.tfvars.json b/...rm/custom_domains/environment_domains/workspace_variables/find_production_aks.tfvars.json
@@ -4,14 +4,24 @@
       "front_door_name": "s189p01-ftt-svc-domains-fd",
       "resource_group_name": "s189p01-fttdomains-rg",
       "domains": [
-        "www"
+        "www", "apex"
       ],
       "cached_paths": [
         "/assets/*"
       ],
       "environment_short": "pd",
       "origin_hostname": "publish-production.teacherservices.cloud",
-      "null_host_header": true
+      "null_host_header": true,
+      "redirect_rules": [
+        {
+          "from-domain": "apex",
+          "to-domain": "find-teacher-training-courses.service.gov.uk"
+        },
+        {
+          "from-domain": "www",
+          "to-domain": "find-teacher-training-courses.service.gov.uk"
+        }
+      ]
     },
     "find-teacher-training-courses.service.gov.uk": {
       "front_door_name": "s189p01-fttc-svc-domains-fd",
@@ -24,7 +34,8 @@
       ],
       "environment_short": "pd",
       "origin_hostname": "publish-production.teacherservices.cloud",
-      "null_host_header": true
+      "null_host_header": true,
+      "redirect_rules": []
     }
   }
 }
diff --git a/terraform/custom_domains/environment_domains/workspace_variables/find_qa_aks.tfvars.json b/terraform/custom_domains/environment_domains/workspace_variables/find_qa_aks.tfvars.json
@@ -11,7 +11,13 @@
       ],
       "environment_short": "qa",
       "origin_hostname": "publish-qa.test.teacherservices.cloud",
-      "null_host_header": true
+      "null_host_header": true,
+      "redirect_rules": [
+        {
+          "from-domain": "qa",
+          "to-domain": "qa.find-teacher-training-courses.service.gov.uk"
+        }
+      ]
     },
     "find-teacher-training-courses.service.gov.uk": {
       "front_door_name": "s189p01-fttc-svc-domains-fd",
@@ -24,7 +30,8 @@
       ],
       "environment_short": "qa",
       "origin_hostname": "publish-qa.test.teacherservices.cloud",
-      "null_host_header": true
+      "null_host_header": true,
+      "redirect_rules": []
     }
   }
 }
diff --git a/...aform/custom_domains/environment_domains/workspace_variables/find_sandbox_aks.tfvars.json b/...aform/custom_domains/environment_domains/workspace_variables/find_sandbox_aks.tfvars.json
@@ -11,7 +11,13 @@
       ],
       "environment_short": "sbx",
       "origin_hostname": "publish-sandbox.teacherservices.cloud",
-      "null_host_header": true
+      "null_host_header": true,
+      "redirect_rules": [
+        {
+          "from-domain": "sandbox",
+          "to-domain": "sandbox.find-teacher-training-courses.service.gov.uk"
+        }
+      ]
     },
     "find-teacher-training-courses.service.gov.uk": {
       "front_door_name": "s189p01-fttc-svc-domains-fd",
@@ -24,7 +30,8 @@
       ],
       "environment_short": "sbx",
       "origin_hostname": "publish-sandbox.teacherservices.cloud",
-      "null_host_header": true
+      "null_host_header": true,
+      "redirect_rules": []
     }
   }
 }
diff --git a/...aform/custom_domains/environment_domains/workspace_variables/find_staging_aks.tfvars.json b/...aform/custom_domains/environment_domains/workspace_variables/find_staging_aks.tfvars.json
@@ -11,7 +11,13 @@
       ],
       "environment_short": "stg",
       "origin_hostname": "publish-staging.test.teacherservices.cloud",
-      "null_host_header": true
+      "null_host_header": true,
+      "redirect_rules": [
+        {
+          "from-domain": "staging",
+          "to-domain": "staging.find-teacher-training-courses.service.gov.uk"
+        }
+      ]
     },
     "find-teacher-training-courses.service.gov.uk": {
       "front_door_name": "s189p01-fttc-svc-domains-fd",
@@ -24,7 +30,8 @@
       ],
       "environment_short": "stg",
       "origin_hostname": "publish-staging.test.teacherservices.cloud",
-      "null_host_header": true
+      "null_host_header": true,
+      "redirect_rules": []
     }
   }
 }