Skip to content

Commit 08cbd53

Browse files
authored
Merge pull request #2404 from Japannext/ldap
Add the missing mod_authnz_ldap parameters
2 parents 4cfcbbd + c99d969 commit 08cbd53

File tree

1 file changed

+43
-4
lines changed

1 file changed

+43
-4
lines changed

templates/vhost/_directories.erb

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -299,11 +299,50 @@
299299
AuthLDAPGroupAttribute <%= groupattr %>
300300
<%- end -%>
301301
<%- end -%>
302-
<%- if directory['auth_ldap_group_attribute_is_dn'] == 'off' -%>
303-
AuthLDAPGroupAttributeIsDN Off
302+
<%- unless directory['auth_ldap_group_attribute_is_dn'].nil? -%>
303+
AuthLDAPGroupAttributeIsDN <%= scope.call_function('apache::bool2httpd', [ directory['auth_ldap_group_attribute_is_dn'] ]) %>
304304
<%- end -%>
305-
<%- if directory['auth_ldap_group_attribute_is_dn'] == 'on' -%>
306-
AuthLDAPGroupAttributeIsDN On
305+
<%- if directory['auth_ldap_initial_bind_pattern'] -%>
306+
AuthLDAPInitialBindPattern <%= directory['auth_ldap_initial_bind_pattern'] %>
307+
<%- end -%>
308+
<%- unless directory['auth_ldap_bind_as_user'].nil? -%>
309+
AuthLDAPInitialBindAsUser <%= scope.call_function('apache::bool2httpd', [ directory['auth_ldap_bind_as_user'] ]) %>
310+
<%- end -%>
311+
<%- unless directory['auth_ldap_compare_as_user'].nil? -%>
312+
AuthLDAPCompareAsUser <%= scope.call_function('apache::bool2httpd', [ directory['auth_ldap_compare_as_user'] ]) %>
313+
<%- end -%>
314+
<%- unless directory['auth_ldap_search_as_user'].nil? -%>
315+
AuthLDAPSearchAsUser <%= scope.call_function('apache::bool2httpd', [ directory['auth_ldap_search_as_user'] ]) %>
316+
<%- end -%>
317+
<%- unless directory['auth_ldap_bind_authoritative'].nil? -%>
318+
AuthLDAPBindAuthoritative <%= scope.call_function('apache::bool2httpd', [ directory['auth_ldap_bind_authoritative'] ]) %>
319+
<%- end -%>
320+
<%- if directory['auth_ldap_authorize_prefix'] -%>
321+
AuthLDAPAuthorizePrefix <%= directory['auth_ldap_authorize_prefix'] %>
322+
<%- end -%>
323+
<%- if directory['auth_ldap_charset_config'] -%>
324+
AuthLDAPCharsetConfig <%= directory['auth_ldap_charset_config'] %>
325+
<%- end -%>
326+
<%- unless directory['auth_ldap_compare_dn_on_server'].nil? -%>
327+
AuthLDAPCompareDNOnServer <%= scope.call_function('apache::bool2httpd', [ directory['auth_ldap_compare_dn_on_server'] ]) %>
328+
<%- end -%>
329+
<%- if directory['auth_ldap_dereference_aliases'] -%>
330+
AuthLDAPDereferenceAliases <%= directory['auth_ldap_dereference_aliases'] %>
331+
<%- end -%>
332+
<%- if directory['auth_ldap_max_sub_group_depth'] -%>
333+
AuthLDAPMaxSubGroupDepth <%= directory['auth_ldap_max_sub_group_depth'] %>
334+
<%- end -%>
335+
<%- if directory['auth_ldap_remote_user_attribute'] -%>
336+
AuthLDAPRemoteUserAttribute <%= directory['auth_ldap_remote_user_attribute'] %>
337+
<%- end -%>
338+
<%- unless directory['auth_ldap_remote_user_is_dn'].nil? -%>
339+
AuthLDAPRemoteUserIsDN <%= scope.call_function('apache::bool2httpd', [ directory['auth_ldap_remote_user_is_dn'] ]) %>
340+
<%- end -%>
341+
<%- if directory['auth_ldap_sub_group_attribute'] -%>
342+
AuthLDAPSubGroupAttribute <%= directory['auth_ldap_sub_group_attribute'] %>
343+
<%- end -%>
344+
<%- if directory['auth_ldap_sub_group_class'] -%>
345+
AuthLDAPSubGroupClass <%= directory['auth_ldap_sub_group_class'] %>
307346
<%- end -%>
308347
<%- if directory['fallbackresource'] -%>
309348
FallbackResource <%= directory['fallbackresource'] %>

0 commit comments

Comments
 (0)