Skip to content

fix(infra): use new site names #2614

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Sep 27, 2024
Merged

fix(infra): use new site names #2614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc8bfed
fix(infra): use new site names
JacobCoffee Sep 27, 2024
84515d4
Merge branch 'main' into fix-site-name
JacobCoffee Sep 27, 2024
ceb601b
fix(infra): update validation regex
JacobCoffee Sep 27, 2024
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
4 changes: 2 additions & 2 deletions infra/cdn/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ variable "ngwaf_site_name" {
description = "Site SHORT name for NGWAF"

validation {
condition = can(regex("^(test|stage|prod)$", var.ngwaf_site_name))
error_message = "'ngwaf_site_name' must be one of the following: test, stage, or prod"
condition = can(regex("^(pythondotorg-test|pythondotorg-prod)$", var.ngwaf_site_name))
error_message = "'ngwaf_site_name' must be one of the following: pythondotorg-test, or pythondotorg-prod"
}
}
variable "ngwaf_email" {
Expand Down
4 changes: 2 additions & 2 deletions infra/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module "fastly_production" {
fastly_header_token = var.FASTLY_HEADER_TOKEN
s3_logging_keys = var.fastly_s3_logging

ngwaf_site_name = "prod"
ngwaf_site_name = "pythondotorg-prod"
ngwaf_email = "infrastructure-staff@python.org"
ngwaf_token = var.ngwaf_token
activate_ngwaf_service = true
Expand All @@ -35,7 +35,7 @@ module "fastly_staging" {
fastly_header_token = var.FASTLY_HEADER_TOKEN
s3_logging_keys = var.fastly_s3_logging

ngwaf_site_name = "test"
ngwaf_site_name = "pythondotorg-test"
ngwaf_email = "infrastructure-staff@python.org"
ngwaf_token = var.ngwaf_token
activate_ngwaf_service = true
Expand Down