diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb index b63b7ff49f..7447e48e1b 100644 --- a/templates/vhost/_directories.erb +++ b/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'] %>