Merge branch 'main' into main

Author: Ramesh7

REFERENCE.md

@@ -346,7 +346,7 @@ Default value: `true`
 
 ##### <a name="-apache--default_mods"></a>`default_mods`
 
-Data type: `Variant[Array, Boolean]`
+Data type: `Variant[Array[String[1]], Boolean]`
 
 Determines whether to configure and enable a set of default Apache modules depending on
 your operating system.<br />
@@ -356,7 +356,14 @@ on your operating system, and you can declare any other modules separately using
 If `true`, Puppet installs additional modules, depending on the operating system and
 the value of the `mpm_module` parameter. Because these lists of
 modules can change frequently, consult the Puppet module's code for up-to-date lists.<br />
-If this parameter contains an array, Puppet instead enables all passed Apache modules.
+If this parameter contains an array, Puppet will enable all the Apache modules passed in it.
+Passing the values as an array of strings provides the flexibility to override the default mods and install modules defined in `$default_mods`.
+For example, with array of string:<br />
+```puppet
+class { 'apache':
+  default_mods => ['cache', 'info', 'mime_magic']
+}
+```
 
 Default value: `true`
 

manifests/default_mods.pp

@@ -3,9 +3,9 @@
 #
 # @api private
 class apache::default_mods (
-  Boolean $all                                   = true,
-  Optional[Variant[Array[String], String]] $mods = undef,
-  Boolean $use_systemd                           = $apache::use_systemd,
+  Boolean $all                                         = true,
+  Optional[Variant[Array[String[1]], String[1]]] $mods = undef,
+  Boolean $use_systemd                                 = $apache::use_systemd,
 ) {
   # These are modules required to run the default configuration.
   # They are not configurable at this time, so we just include

manifests/init.pp

@@ -459,7 +459,7 @@
 class apache (
   String $apache_name                                                        = $apache::params::apache_name,
   String $service_name                                                       = $apache::params::service_name,
-  Variant[Array, Boolean] $default_mods                                      = true,
+  Variant[Array[String[1]], Boolean] $default_mods                           = true,
   Boolean $default_vhost                                                     = true,
   Optional[String] $default_charset                                          = undef,
   Boolean $default_confd_files                                               = true,

metadata.json

@@ -83,7 +83,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 7.0.0 < 9.0.0"
+      "version_requirement": ">= 7.9.0 < 9.0.0"
     }
   ],
   "description": "Module for Apache configuration",

templates/vhost/_directories.erb

@@ -299,11 +299,50 @@
     AuthLDAPGroupAttribute <%= groupattr %>
       <%- end -%>
     <%- end -%>
-    <%- if directory['auth_ldap_group_attribute_is_dn'] == 'off' -%>
-    AuthLDAPGroupAttributeIsDN Off
+    <%- unless directory['auth_ldap_group_attribute_is_dn'].nil? -%>
+    AuthLDAPGroupAttributeIsDN <%= scope.call_function('apache::bool2httpd', [ directory['auth_ldap_group_attribute_is_dn'] ]) %>
     <%- end -%>
-    <%- if directory['auth_ldap_group_attribute_is_dn'] == 'on' -%>
-    AuthLDAPGroupAttributeIsDN On
+    <%- if directory['auth_ldap_initial_bind_pattern'] -%>
+    AuthLDAPInitialBindPattern <%= directory['auth_ldap_initial_bind_pattern'] %>
+    <%- end -%>
+    <%- unless directory['auth_ldap_bind_as_user'].nil? -%>
+    AuthLDAPInitialBindAsUser <%= scope.call_function('apache::bool2httpd', [ directory['auth_ldap_bind_as_user'] ]) %>
+    <%- end -%>
+    <%- unless directory['auth_ldap_compare_as_user'].nil? -%>
+    AuthLDAPCompareAsUser <%= scope.call_function('apache::bool2httpd', [ directory['auth_ldap_compare_as_user'] ]) %>
+    <%- end -%>
+    <%- unless directory['auth_ldap_search_as_user'].nil? -%>
+    AuthLDAPSearchAsUser <%= scope.call_function('apache::bool2httpd', [ directory['auth_ldap_search_as_user'] ]) %>
+    <%- end -%>
+    <%- unless directory['auth_ldap_bind_authoritative'].nil? -%>
+    AuthLDAPBindAuthoritative <%= scope.call_function('apache::bool2httpd', [ directory['auth_ldap_bind_authoritative'] ]) %>
+    <%- end -%>
+    <%- if directory['auth_ldap_authorize_prefix'] -%>
+    AuthLDAPAuthorizePrefix <%= directory['auth_ldap_authorize_prefix'] %>
+    <%- end -%>
+    <%- if directory['auth_ldap_charset_config'] -%>
+    AuthLDAPCharsetConfig <%= directory['auth_ldap_charset_config'] %>
+    <%- end -%>
+    <%- unless directory['auth_ldap_compare_dn_on_server'].nil? -%>
+    AuthLDAPCompareDNOnServer <%= scope.call_function('apache::bool2httpd', [ directory['auth_ldap_compare_dn_on_server'] ]) %>
+    <%- end -%>
+    <%- if directory['auth_ldap_dereference_aliases'] -%>
+    AuthLDAPDereferenceAliases <%= directory['auth_ldap_dereference_aliases'] %>
+    <%- end -%>
+    <%- if directory['auth_ldap_max_sub_group_depth'] -%>
+    AuthLDAPMaxSubGroupDepth <%= directory['auth_ldap_max_sub_group_depth'] %>
+    <%- end -%>
+    <%- if directory['auth_ldap_remote_user_attribute'] -%>
+    AuthLDAPRemoteUserAttribute <%= directory['auth_ldap_remote_user_attribute'] %>
+    <%- end -%>
+    <%- unless directory['auth_ldap_remote_user_is_dn'].nil? -%>
+    AuthLDAPRemoteUserIsDN <%= scope.call_function('apache::bool2httpd', [ directory['auth_ldap_remote_user_is_dn'] ]) %>
+    <%- end -%>
+    <%- if directory['auth_ldap_sub_group_attribute'] -%>
+    AuthLDAPSubGroupAttribute <%= directory['auth_ldap_sub_group_attribute'] %>
+    <%- end -%>
+    <%- if directory['auth_ldap_sub_group_class'] -%>
+    AuthLDAPSubGroupClass <%= directory['auth_ldap_sub_group_class'] %>
     <%- end -%>
     <%- if directory['fallbackresource'] -%>
     FallbackResource <%= directory['fallbackresource'] %>