Merge branch 'godard-apache' of https://salsa.debian.org/waldi/dsa-puppet

RT#7092

diff --git a/modules/apache2/files/headers b/modules/apache2/files/headers
index 15d3b08..89e6933 100644 (file)
--- a/modules/apache2/files/headers
+++ b/modules/apache2/files/headers
@@ -1,9 +1,9 @@
 <IfModule mod_headers.c>
   Header set X-Clacks-Overhead "GNU Terry Pratchett"
 
-  Header always setifempty X-Content-Type-Options "nosniff"
-  Header always setifempty X-Frame-Options "sameorigin"
-  Header always setifempty Referrer-Policy "no-referrer"
-  # Header always setifempty X-Xss-Protection "1; mode=block"
-  Header always setifempty X-Xss-Protection "1"
+  Header always set X-Content-Type-Options "nosniff" "expr=-z %{resp:X-Content-Type-Options}"
+  Header always set X-Frame-Options "sameorigin" "expr=-z %{resp:X-Frame-Options}"
+  Header always set Referrer-Policy "no-referrer" "expr=-z %{resp:Referrer-Policy}"
+  # Header always set X-Xss-Protection "1; mode=block" "expr=-z %{resp:X-Xss-Protection}"
+  Header always set X-Xss-Protection "1" "expr=-z %{resp:X-Xss-Protection}"
 </IfModule>