Mercurial > repos > other > Puppet

diff modules/website/manifests/https.pp @ 236:4519b727cc4c puppet-3.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make Content-Security-Policy cleaner and easier to set
author IBBoard <dev@ibboard.co.uk>
date Wed, 18 Dec 2019 21:22:50 +0000
parents 1df1e161bbb5
children 0ebd8efeef04
line wrap: on
line diff
--- a/modules/website/manifests/https.pp	Sun Dec 15 16:28:47 2019 +0000
+++ b/modules/website/manifests/https.pp	Wed Dec 18 21:22:50 2019 +0000
@@ -16,6 +16,8 @@
     $force_no_www       = true,
     $force_no_index     = true,
     $lockdown_requests  = true,
+    $csp_override       = undef,
+    $csp_report_override = undef,
   ) {
 
   if ! defined(Class['website']) {
@@ -35,6 +37,9 @@
     $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)
+
   $custom_conf0 = template('website/https_core_conf.erb')
 
   if $force_no_index {