Only include modules if ensure is present

ekohl · ekohl · commit 3262f233479c · 2022-06-24T15:08:04.000+02:00
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
@@ -2740,7 +2740,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 {
+  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' {
     include apache::mod::http2
 
     concat::fragment { "${name}-http2":
@@ -2750,13 +2750,13 @@
     }
   }
 
-  if $mdomain {
+  if $mdomain and $ensure == 'present' {
     include apache::mod::md
   }
 
   # Template uses:
   # - $userdir
-  if $userdir {
+  if $userdir and $ensure == 'present' {
     include apache::mod::userdir
 
     concat::fragment { "${name}-userdir":

Original file line number	Diff line number	Diff line change
`@@ -2740,7 +2740,7 @@`
`2740`	`2740`	`}`
`2741`	`2741`	`}`
`2742`	`2742`
`2743`		`- 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 {`
	`2743`	`+ 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' {`
`2744`	`2744`	`include apache::mod::http2`
`2745`	`2745`
`2746`	`2746`	`concat::fragment { "${name}-http2":`
`@@ -2750,13 +2750,13 @@`
`2750`	`2750`	`}`
`2751`	`2751`	`}`
`2752`	`2752`
`2753`		`- if $mdomain {`
	`2753`	`+ if $mdomain and $ensure == 'present' {`
`2754`	`2754`	`include apache::mod::md`
`2755`	`2755`	`}`
`2756`	`2756`
`2757`	`2757`	`# Template uses:`
`2758`	`2758`	`# - $userdir`
`2759`		`- if $userdir {`
	`2759`	`+ if $userdir and $ensure == 'present' {`
`2760`	`2760`	`include apache::mod::userdir`
`2761`	`2761`
`2762`	`2762`	`concat::fragment { "${name}-userdir":`