From 6fa784a66061551e844203f17ad9367f7ad41d4b Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Thu, 13 Oct 2022 20:07:59 +0200
Subject: [PATCH] Automatically enable mod_http2 if needed

Following https://httpd.apache.org/docs/current/howto/http2.html the
first step is to load the http2 module. By inspecting the protocols
argument users can enable HTTP/2 via Hiera.
---
 manifests/init.pp  | 4 ++++
 manifests/vhost.pp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 50155fa885..e7640476b7 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -827,6 +827,10 @@
       include "::apache::mod::${mpm_module}"
     }
 
+    if 'h2' in $protocols or 'h2c' in $protocols {
+      include apache::mod::http2
+    }
+
     $default_vhost_ensure = $default_vhost ? {
       true  => 'present',
       false => 'absent'
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 01aaee946f..a4db687704 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -2704,7 +2704,7 @@
     }
   }
 
-  if ($h2_copy_files != undef or $h2_direct != undef or $h2_early_hints != undef or $h2_max_session_streams != undef or $h2_modern_tls_only != undef or $h2_push != undef or $h2_push_diary_size != undef or $h2_push_priority != [] or $h2_push_resource != [] or $h2_serialize_headers != undef or $h2_stream_max_mem_size != undef or $h2_tls_cool_down_secs != undef or $h2_tls_warm_up_size != undef or $h2_upgrade != undef or $h2_window_size != undef) and $ensure == 'present' {
+  if ('h2' in $protocols or 'h2c' in $protocols or $h2_copy_files != undef or $h2_direct != undef or $h2_early_hints != undef or $h2_max_session_streams != undef or $h2_modern_tls_only != undef or $h2_push != undef or $h2_push_diary_size != undef or $h2_push_priority != [] or $h2_push_resource != [] or $h2_serialize_headers != undef or $h2_stream_max_mem_size != undef or $h2_tls_cool_down_secs != undef or $h2_tls_warm_up_size != undef or $h2_upgrade != undef or $h2_window_size != undef) and $ensure == 'present' {
     include apache::mod::http2
 
     concat::fragment { "${name}-http2":