diff modules/website/manifests/https.pp @ 263:f99974dc0f1a

Add a way to skip setting CSP NextCloud manages CSP itself, so we don't need the header in the PIM subdomain causing confusion and incorrect results
author IBBoard <dev@ibboard.co.uk>
date Sun, 29 Dec 2019 16:43:55 +0000
parents 0ebd8efeef04
children 13825cc1ec57
line wrap: on
line diff
--- a/modules/website/manifests/https.pp	Sun Dec 29 11:00:05 2019 -0500
+++ b/modules/website/manifests/https.pp	Sun Dec 29 16:43:55 2019 +0000
@@ -16,7 +16,9 @@
     $force_no_www       = true,
     $force_no_index     = true,
     $lockdown_requests  = true,
+    $csp                = true,
     $csp_override       = undef,
+    $csp_report         = true,
     $csp_report_override = undef,
   ) {
 
@@ -37,8 +39,12 @@
     $primary_name = $name
   }
 
-  $csp_string = hash_to_csp($website::csp_base, $csp_override)
-  $csp_report_string = hash_to_csp($website::csp_report_base, $csp_report_override)
+  if $csp {
+    $csp_string = hash_to_csp($website::csp_base, $csp_override)
+  }
+  if $csp_report {
+    $csp_report_string = hash_to_csp($website::csp_report_base, $csp_report_override)
+  }
 
   $custom_conf0 = template('website/https_core_conf.erb')