Merge pull request #72 from alphagov/add-private_extra_vcl_recv-back

Allow to configure private extra vcl_recv for www and DGU
alphagov · Apr 10, 2024 · 1497055 · 1497055
2 parents 9039f36 + 7e108f8
commit 1497055
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/modules/datagovuk/datagovuk.vcl.tftpl b/modules/datagovuk/datagovuk.vcl.tftpl
@@ -72,6 +72,10 @@ sub vcl_recv {
   if (!req.http.Fastly-SSL) {
      error 801 "Force SSL";
   }
+
+  %{ if private_extra_vcl_recv != "" ~}
+    ${private_extra_vcl_recv}
+  %{ endif ~}
 
   ${indent(2, file("${module_path}/../shared/_security_txt_request.vcl"))}
 

diff --git a/modules/datagovuk/service.tf b/modules/datagovuk/service.tf
@@ -30,6 +30,8 @@ locals {
       gcs_mirror_prefix = null
       gcs_mirror_probe = null
       gcs_mirror_port = 443
+
+      private_extra_vcl_recv = ""
     },
     { # computed values
       formatted_allowed_ip_addresses = local.formatted_allowed_ips

diff --git a/modules/www/service.tf b/modules/www/service.tf
@@ -31,6 +31,7 @@ locals {
       gcs_mirror_probe           = null
       gcs_mirror_port            = 443
 
+      private_extra_vcl_recv = ""
       ab_tests = []
     },
     { # computed values

diff --git a/modules/www/www.vcl.tftpl b/modules/www/www.vcl.tftpl
@@ -199,6 +199,10 @@ sub vcl_recv {
   if (!req.http.Fastly-SSL) {
      error 801 "Force SSL";
   }
+
+  %{ if private_extra_vcl_recv != "" ~}
+    ${private_extra_vcl_recv}
+  %{ endif ~}
 
   ${indent(2, file("${module_path}/../shared/_security_txt_request.vcl"))}