Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2158] Staging and sandbox front door domains #2070

Merged
merged 3 commits into from
Dec 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
TERRAFILE_VERSION=0.8
ARM_TEMPLATE_TAG=1.1.6
RG_TAGS={"Product" : "Register for National Professional Qualifications (NPQ)"}
REGION=UK South
Expand Down Expand Up @@ -139,7 +138,7 @@ domains-infra-plan: domains domains-infra-init
domains-infra-apply: domains domains-infra-init
terraform -chdir=terraform/domains/infrastructure apply -var-file config/zones.tfvars.json ${AUTO_APPROVE}

domains-init: domains-composed-variables domains set-azure-account
domains-init: domains domains-composed-variables set-azure-account
rm -rf terraform/domains/environment_domains/vendor/modules/domains
git -c advice.detachedHead=false clone --depth=1 --single-branch --branch ${TERRAFORM_MODULES_TAG} https://github.com/DFE-Digital/terraform-modules.git terraform/domains/environment_domains/vendor/modules/domains

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,7 @@
"/packs/*"
],
"environment_short": "pd",
"origin_hostname": "npq-registration-production-web.teacherservices.cloud",
"cnames": {
"_14c49b3a20d4ad049e0708795e1f8ca4": {
"target": "_9156bba248c12a46b784f7312750bd29.gwpjclltnz.acm-validations.aws.",
"ttl": 86400
}
}
"origin_hostname": "npq-registration-production-web.teacherservices.cloud"
}
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"hosted_zone": {
"register-national-professional-qualifications.education.gov.uk": {
"front_door_name": "s189p01-cpdnpqdomains-fd",
"resource_group_name": "s189p01-cpdnpqdomains-rg",
"domains": [
"t"
],
"cached_paths": [
"/packs/*"
],
"environment_short": "sb",
"origin_hostname": "npq-registration-sandbox-web.teacherservices.cloud"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"hosted_zone": {
"register-national-professional-qualifications.education.gov.uk": {
"front_door_name": "s189p01-cpdnpqdomains-fd",
"resource_group_name": "s189p01-cpdnpqdomains-rg",
"domains": [
"x"
],
"cached_paths": [
"/packs/*"
],
"environment_short": "st",
"origin_hostname": "npq-registration-staging-web.test.teacherservices.cloud"
}
}
}
6 changes: 0 additions & 6 deletions terraform/domains/environment_domains/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,3 @@ module "domains" {
null_host_header = try(each.value.null_host_header, false)
cached_paths = try(each.value.cached_paths, [])
}

# Takes values from hosted_zone.domain_name.cnames (or txt_records, a-records). Use for domains which are not associated with front door.
module "dns_records" {
source = "./vendor/modules/domains//dns/records"
hosted_zone = var.hosted_zone
}
3 changes: 0 additions & 3 deletions terraform/domains/infrastructure/config/zones_Terrafile

This file was deleted.

Loading