Skip to content

Commit cb26e80

Browse files
authored
Merge branch 'main' into dependabot/pip/responses-0.25.3
2 parents 371f5f0 + 306a73d commit cb26e80

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

base-requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ django-waffle==2.2.1
4242

4343
djangorestframework==3.14.0 # 3.14.0 is first version that supports Django 4.1, 4.2 support hasnt been "released"
4444
django-filter==2.4.0
45-
django-ordered-model==3.4.3
45+
django-ordered-model==3.7.4
4646
django-widget-tweaks==1.5.0
4747
django-countries==7.2.1
48-
num2words==0.5.10
48+
num2words==0.5.13
4949
django-polymorphic==3.1.0 # 3.1.0 is first version that supports Django 4.0, unsure if it fully supports 4.2
5050
sorl-thumbnail==12.7.0
5151
django-extensions==3.1.4

infra/cdn/main.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ resource "fastly_service_vcl" "python_org" {
44
http3 = false
55
stale_if_error = false
66
stale_if_error_ttl = 43200
7-
activate = false
7+
activate = true
88

99
domain {
1010
name = var.domain
@@ -347,6 +347,7 @@ resource "fastly_service_vcl" "python_org" {
347347
for_each = var.activate_ngwaf_service ? [1] : []
348348
content {
349349
name = var.edge_security_dictionary
350+
force_destroy = true
350351
}
351352
}
352353

infra/cdn/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ variable "activate_ngwaf_service" {
5050
variable "edge_security_dictionary" {
5151
type = string
5252
description = "The dictionary name for the Edge Security product."
53-
default = ""
53+
default = "Edge_Security"
5454
}
5555
variable "ngwaf_corp_name" {
5656
type = string

0 commit comments

Comments
 (0)