Make module inclusion consistent in vhost.pp

There is no need to call defined() before calling include since include
handles it already.

It also consistently checks if $ensure is set to present before
including modules.

Author: ekohl

manifests/vhost.pp

@@ -2046,19 +2046,19 @@
     include apache::mod::auth_openidc
   }
 
-  if $virtual_docroot {
+  if $virtual_docroot and $ensure == 'present' {
     include apache::mod::vhost_alias
   }
 
-  if $wsgi_application_group or $wsgi_daemon_process or ($wsgi_import_script and $wsgi_import_script_options) or $wsgi_process_group or ($wsgi_script_aliases and ! empty($wsgi_script_aliases)) or $wsgi_pass_authorization {
+  if ($wsgi_application_group or $wsgi_daemon_process or ($wsgi_import_script and $wsgi_import_script_options) or $wsgi_process_group or ($wsgi_script_aliases and ! empty($wsgi_script_aliases)) or $wsgi_pass_authorization) and $ensure == 'present' {
     include apache::mod::wsgi
   }
 
-  if $suexec_user_group {
+  if $suexec_user_group and $ensure == 'present' {
     include apache::mod::suexec
   }
 
-  if $passenger_enabled != undef or $passenger_start_timeout != undef or $passenger_ruby != undef or $passenger_python != undef or $passenger_nodejs != undef or $passenger_meteor_app_settings != undef or $passenger_app_env != undef or $passenger_app_root != undef or $passenger_app_group_name != undef or $passenger_app_start_command != undef or $passenger_app_type != undef or $passenger_startup_file != undef or $passenger_restart_dir != undef or $passenger_spawn_method != undef or $passenger_load_shell_envvars != undef or $passenger_preload_bundler != undef or $passenger_rolling_restarts != undef or $passenger_resist_deployment_errors != undef or $passenger_min_instances != undef or $passenger_max_instances != undef or $passenger_max_preloader_idle_time != undef or $passenger_force_max_concurrent_requests_per_process != undef or $passenger_concurrency_model != undef or $passenger_thread_count != undef or $passenger_high_performance != undef or $passenger_max_request_queue_size != undef or $passenger_max_request_queue_time != undef or $passenger_user != undef or $passenger_group != undef or $passenger_friendly_error_pages != undef or $passenger_buffer_upload != undef or $passenger_buffer_response != undef or $passenger_allow_encoded_slashes != undef or $passenger_lve_min_uid != undef or $passenger_base_uri != undef or $passenger_error_override != undef or $passenger_sticky_sessions != undef or $passenger_sticky_sessions_cookie_name != undef or $passenger_sticky_sessions_cookie_attributes != undef or $passenger_app_log_file != undef or $passenger_debugger != undef or $passenger_max_requests != undef or $passenger_max_request_time != undef or $passenger_memory_limit != undef {
+  if ($passenger_enabled != undef or $passenger_start_timeout != undef or $passenger_ruby != undef or $passenger_python != undef or $passenger_nodejs != undef or $passenger_meteor_app_settings != undef or $passenger_app_env != undef or $passenger_app_root != undef or $passenger_app_group_name != undef or $passenger_app_start_command != undef or $passenger_app_type != undef or $passenger_startup_file != undef or $passenger_restart_dir != undef or $passenger_spawn_method != undef or $passenger_load_shell_envvars != undef or $passenger_preload_bundler != undef or $passenger_rolling_restarts != undef or $passenger_resist_deployment_errors != undef or $passenger_min_instances != undef or $passenger_max_instances != undef or $passenger_max_preloader_idle_time != undef or $passenger_force_max_concurrent_requests_per_process != undef or $passenger_concurrency_model != undef or $passenger_thread_count != undef or $passenger_high_performance != undef or $passenger_max_request_queue_size != undef or $passenger_max_request_queue_time != undef or $passenger_user != undef or $passenger_group != undef or $passenger_friendly_error_pages != undef or $passenger_buffer_upload != undef or $passenger_buffer_response != undef or $passenger_allow_encoded_slashes != undef or $passenger_lve_min_uid != undef or $passenger_base_uri != undef or $passenger_error_override != undef or $passenger_sticky_sessions != undef or $passenger_sticky_sessions_cookie_name != undef or $passenger_sticky_sessions_cookie_attributes != undef or $passenger_app_log_file != undef or $passenger_debugger != undef or $passenger_max_requests != undef or $passenger_max_request_time != undef or $passenger_memory_limit != undef) and $ensure == 'present' {
     include apache::mod::passenger
   }
 
@@ -2226,69 +2226,53 @@
   }
 
   # Load mod_rewrite if needed and not yet loaded
-  if $rewrites or $rewrite_cond {
-    if ! defined(Class['apache::mod::rewrite']) {
-      include apache::mod::rewrite
-    }
+  if ($rewrites or $rewrite_cond) and $ensure == 'present' {
+    include apache::mod::rewrite
   }
 
   # Load mod_alias if needed and not yet loaded
   if ($scriptalias or $scriptaliases != [])
   or ($aliases and $aliases != [])
   or ($redirect_source and $redirect_dest)
   or ($redirectmatch_regexp or $redirectmatch_status or $redirectmatch_dest) {
-    if ! defined(Class['apache::mod::alias'])  and ($ensure == 'present') {
+    if $ensure == 'present' {
       include apache::mod::alias
     }
   }
 
   # Load mod_proxy if needed and not yet loaded
-  if ($proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match) {
-    if ! defined(Class['apache::mod::proxy']) {
-      include apache::mod::proxy
-    }
-    if ! defined(Class['apache::mod::proxy_http']) {
-      include apache::mod::proxy_http
-    }
+  if ($proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match) and $ensure == 'present' {
+    include apache::mod::proxy
+    include apache::mod::proxy_http
   }
 
   # Load mod_fastcgi if needed and not yet loaded
-  if $fastcgi_server and $fastcgi_socket {
-    if ! defined(Class['apache::mod::fastcgi']) {
-      include apache::mod::fastcgi
-    }
+  if ($fastcgi_server and $fastcgi_socket) and $ensure == 'present' {
+    include apache::mod::fastcgi
   }
 
   # Check if mod_headers is required to process $headers/$request_headers
-  if $headers or $request_headers {
-    if ! defined(Class['apache::mod::headers']) {
-      include apache::mod::headers
-    }
+  if ($headers or $request_headers) and $ensure == 'present' {
+    include apache::mod::headers
   }
 
   # Check if mod_filter is required to process $filters
-  if $filters {
-    if ! defined(Class['apache::mod::filter']) {
-      include apache::mod::filter
-    }
+  if $filters and $ensure == 'present' {
+    include apache::mod::filter
   }
 
   # Check if mod_env is required and not yet loaded.
   # create an expression to simplify the conditional check
   $use_env_mod = $setenv and ! empty($setenv)
-  if ($use_env_mod) {
-    if ! defined(Class['apache::mod::env']) {
-      include apache::mod::env
-    }
+  if $use_env_mod and $ensure == 'present' {
+    include apache::mod::env
   }
   # Check if mod_setenvif is required and not yet loaded.
   # create an expression to simplify the conditional check
   $use_setenvif_mod = ($setenvif and ! empty($setenvif)) or ($setenvifnocase and ! empty($setenvifnocase))
 
-  if ($use_setenvif_mod) {
-    if ! defined(Class['apache::mod::setenvif']) {
-      include apache::mod::setenvif
-    }
+  if $use_setenvif_mod and $ensure == 'present' {
+    include apache::mod::setenvif
   }
 
   ## Create a default directory list if none defined
@@ -2802,7 +2786,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":
@@ -2812,13 +2796,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":