From 58c03089ab5bc66fa09f9990d0415637b87455f0 Mon Sep 17 00:00:00 2001
From: Grant Slater <github@firefishy.com>
Date: Fri, 14 Oct 2022 11:01:19 +0100
Subject: [PATCH] apache: fix IfModule for mod_brotli.c + align config with
 pristine

---
 .../apache/templates/default/brotli.conf.erb  | 20 ++++++++++--------
 .../apache/templates/default/deflate.conf.erb | 21 +++++++++----------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/cookbooks/apache/templates/default/brotli.conf.erb b/cookbooks/apache/templates/default/brotli.conf.erb
index 7000e590e..3bf3dfcd2 100644
--- a/cookbooks/apache/templates/default/brotli.conf.erb
+++ b/cookbooks/apache/templates/default/brotli.conf.erb
@@ -1,12 +1,14 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-<IfModule mod_deflate.c>
-        <IfModule mod_filter.c>
-                AddOutputFilterByType BROTLI_COMPRESS text/html text/plain text/xml
-                AddOutputFilterByType BROTLI_COMPRESS text/css
-                AddOutputFilterByType BROTLI_COMPRESS application/x-javascript application/javascript application/ecmascript
-                AddOutputFilterByType BROTLI_COMPRESS application/rss+xml
-                AddOutputFilterByType BROTLI_COMPRESS application/xml
-                AddOutputFilterByType BROTLI_COMPRESS image/svg+xml
-        </IfModule>
+<IfModule mod_brotli.c>
+	<IfModule mod_filter.c>
+		AddOutputFilterByType BROTLI_COMPRESS text/html text/plain text/xml text/css text/javascript
+		AddOutputFilterByType BROTLI_COMPRESS application/x-javascript application/javascript application/ecmascript
+		AddOutputFilterByType BROTLI_COMPRESS application/rss+xml
+		AddOutputFilterByType BROTLI_COMPRESS application/wasm
+		AddOutputFilterByType BROTLI_COMPRESS application/xml
+		AddOutputFilterByType BROTLI_COMPRESS image/svg+xml
+	</IfModule>
 </IfModule>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
diff --git a/cookbooks/apache/templates/default/deflate.conf.erb b/cookbooks/apache/templates/default/deflate.conf.erb
index a418736e7..9f9bda5f9 100644
--- a/cookbooks/apache/templates/default/deflate.conf.erb
+++ b/cookbooks/apache/templates/default/deflate.conf.erb
@@ -1,15 +1,14 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 <IfModule mod_deflate.c>
-        <IfModule mod_filter.c>
-                # these are known to be safe with MSIE 6
-                AddOutputFilterByType DEFLATE text/html text/plain text/xml
-
-                # everything else may cause problems with MSIE 6
-                AddOutputFilterByType DEFLATE text/css
-                AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript
-                AddOutputFilterByType DEFLATE application/rss+xml
-                AddOutputFilterByType DEFLATE application/xml
-                AddOutputFilterByType DEFLATE image/svg+xml
-        </IfModule>
+	<IfModule mod_filter.c>
+		AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript
+		AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript
+		AddOutputFilterByType DEFLATE application/rss+xml
+		AddOutputFilterByType DEFLATE application/wasm
+		AddOutputFilterByType DEFLATE application/xml
+		AddOutputFilterByType DEFLATE image/svg+xml
+	</IfModule>
 </IfModule>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
-- 
2.45.1