ben/puppet-dokuwiki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update auth_type to authldap to squelch deprecation warning, fix typo in user_tree

Browse Source
This commit is contained in:
Ben Roberts
2014-11-23 23:46:11 +00:00
parent 7a7a305540
commit 077b087e58
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/local.protected.php.erb
View File

@@ -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 %>';

4
templates/vhost.conf.erb
View File

@@ -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 -%>