Update auth_type to authldap to squelch deprecation warning, fix typo in user_tree
This commit is contained in:
@@ -38,7 +38,7 @@ class dokuwiki::params {
|
||||
$updatecheck = false
|
||||
$content_license = 'CC-BY-SA'
|
||||
$locktime = 30*60
|
||||
$auth_type = 'ldap'
|
||||
$auth_type = 'authldap'
|
||||
$ldap_version = 3
|
||||
$ldap_servers = ['ldap']
|
||||
$ldap_user_tree = 'ou=People,dc=local'
|
||||
|
||||
@@ -21,7 +21,7 @@ $conf['updatecheck'] = <%= @updatecheck ? 1 : 0 %>;
|
||||
# Authentication
|
||||
$conf['openregister'] =
|
||||
$conf['authtype'] = '<%= @auth_type %>';
|
||||
<%- if @auth_type == 'ldap' -%>
|
||||
<%- if @auth_type == 'authldap' -%>
|
||||
$conf['auth']['ldap']['version'] = '<%= @ldap_version %>';
|
||||
$conf['auth']['ldap']['server'] = 'ldap://<%= @ldap_servers.join(" ") %>:389';
|
||||
$conf['auth']['ldap']['usertree'] = '<%= @ldap_user_tree %>';
|
||||
|
||||
@@ -15,11 +15,11 @@
|
||||
Order Allow,Deny
|
||||
Allow from All
|
||||
|
||||
<%- if @auth_type == 'ldap' -%>
|
||||
<%- if @auth_type == 'authldap' -%>
|
||||
AuthType Basic
|
||||
AuthName "LDAP Auth"
|
||||
AuthBasicProvider "ldap"
|
||||
AuthLDAPUrl "ldap://<%= @ldap_servers.join(" ") %>:389/<%= @ldap_usertree %>?<%= @ldap_user_account_attr %>?<%= @ldap_user_scope %>"
|
||||
AuthLDAPUrl "ldap://<%= @ldap_servers.join(" ") %>:389/<%= @ldap_user_tree %>?<%= @ldap_user_account_attr %>?<%= @ldap_user_scope %>"
|
||||
Require valid-user
|
||||
<%- end -%>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user