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
manifests/params.pp
View File

@@ -38,7 +38,7 @@ class dokuwiki::params {
$updatecheck = false $updatecheck = false
$content_license = 'CC-BY-SA' $content_license = 'CC-BY-SA'
$locktime = 30*60 $locktime = 30*60
$auth_type = 'ldap' $auth_type = 'authldap'
$ldap_version = 3 $ldap_version = 3
$ldap_servers = ['ldap'] $ldap_servers = ['ldap']
$ldap_user_tree = 'ou=People,dc=local' $ldap_user_tree = 'ou=People,dc=local'

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

@@ -21,7 +21,7 @@ $conf['updatecheck'] = <%= @updatecheck ? 1 : 0 %>;
# Authentication # Authentication
$conf['openregister'] = $conf['openregister'] =
$conf['authtype'] = '<%= @auth_type %>'; $conf['authtype'] = '<%= @auth_type %>';
<%- if @auth_type == 'ldap' -%> <%- if @auth_type == 'authldap' -%>
$conf['auth']['ldap']['version'] = '<%= @ldap_version %>'; $conf['auth']['ldap']['version'] = '<%= @ldap_version %>';
$conf['auth']['ldap']['server'] = 'ldap://<%= @ldap_servers.join(" ") %>:389'; $conf['auth']['ldap']['server'] = 'ldap://<%= @ldap_servers.join(" ") %>:389';
$conf['auth']['ldap']['usertree'] = '<%= @ldap_user_tree %>'; $conf['auth']['ldap']['usertree'] = '<%= @ldap_user_tree %>';

4
templates/vhost.conf.erb
View File

@@ -15,11 +15,11 @@
Order Allow,Deny Order Allow,Deny
Allow from All Allow from All
<%- if @auth_type == 'ldap' -%> <%- if @auth_type == 'authldap' -%>
AuthType Basic AuthType Basic
AuthName "LDAP Auth" AuthName "LDAP Auth"
AuthBasicProvider "ldap" 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 Require valid-user
<%- end -%> <%- end -%>