Merge branch 'main' into dependabot/pip/responses-0.25.3

Author: JacobCoffee

base-requirements.txt

@@ -42,10 +42,10 @@ django-waffle==2.2.1
 
 djangorestframework==3.14.0  # 3.14.0 is first version that supports Django 4.1, 4.2 support hasnt been "released"
 django-filter==2.4.0
-django-ordered-model==3.4.3
+django-ordered-model==3.7.4
 django-widget-tweaks==1.5.0
 django-countries==7.2.1
-num2words==0.5.10
+num2words==0.5.13
 django-polymorphic==3.1.0  # 3.1.0 is first version that supports Django 4.0, unsure if it fully supports 4.2
 sorl-thumbnail==12.7.0
 django-extensions==3.1.4

infra/cdn/main.tf

@@ -4,7 +4,7 @@ resource "fastly_service_vcl" "python_org" {
   http3              = false
   stale_if_error     = false
   stale_if_error_ttl = 43200
-  activate           = false
+  activate           = true
 
   domain {
     name = var.domain
@@ -347,6 +347,7 @@ resource "fastly_service_vcl" "python_org" {
     for_each = var.activate_ngwaf_service ? [1] : []
     content {
       name = var.edge_security_dictionary
+      force_destroy = true
     }
   }
 

infra/cdn/variables.tf

@@ -50,7 +50,7 @@ variable "activate_ngwaf_service" {
 variable "edge_security_dictionary" {
   type        = string
   description = "The dictionary name for the Edge Security product."
-  default     = ""
+  default     = "Edge_Security"
 }
 variable "ngwaf_corp_name" {
   type        = string