diff --git a/manifests/params.pp b/manifests/params.pp index a3f5c7a..5bee68f 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -8,7 +8,7 @@ class dokuwiki::params { 'Gentoo': { $package_category = 'www-apps' $package_name = 'dokuwiki' - $version = '20140929a' + $version = '20170219e' $use_webapp_config = true $apache_confdir = '/etc/apache2/vhosts.d' $apache_user = 'apache' diff --git a/templates/local.protected.php.erb b/templates/local.protected.php.erb index 1640c78..23ed8b0 100644 --- a/templates/local.protected.php.erb +++ b/templates/local.protected.php.erb @@ -19,27 +19,27 @@ $conf['youarehere'] = <%= @youarehere ? 1 : 0 %>; $conf['updatecheck'] = <%= @updatecheck ? 1 : 0 %>; # Authentication -$conf['openregister'] = +$conf['openregister'] = 0; $conf['authtype'] = '<%= @auth_type %>'; <%- 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 %>'; -$conf['auth']['ldap']['userfilter'] = '<%= @ldap_user_filter %>'; -$conf['auth']['ldap']['userscope'] = '<%= @ldap_user_scope %>'; -$conf['auth']['ldap']['grouptree'] = '<%= @ldap_group_tree %>'; -$conf['auth']['ldap']['groupfilter'] = '<%= @ldap_group_filter %>'; -$conf['auth']['ldap']['groupscope'] = '<%= @ldap_group_scope %>'; -$conf['auth']['ldap']['starttls'] = <%= @ldap_starttls ? 1 : 0 %>; -$conf['auth']['ldap']['sso'] = <%= @ldap_use_sso ? 1 : 0 %>; -$conf['auth']['ldap']['recursive'] = <%= @ldap_recursive_search ? 1 : 0 %>; -$conf['auth']['ldap']['binddn'] = '<%= @ldap_binddn %>'; -$conf['auth']['ldap']['bindpw'] = '<%= @ldap_bindpw %>'; -$conf['auth']['ldap']['referrals'] = <%= @use_referrals ? 1 : 0 %>; -$conf['auth']['ldap']['mapping']['name'] = '<%= @ldap_mapping_name %>'; -$conf['auth']['ldap']['mapping']['grps'] = array(); +$conf['plugin']['authldap']['version'] = '<%= @ldap_version %>'; +$conf['plugin']['authldap']['server'] = 'ldap://<%= @ldap_servers.join(" ") %>:389'; +$conf['plugin']['authldap']['usertree'] = '<%= @ldap_user_tree %>'; +$conf['plugin']['authldap']['userfilter'] = '<%= @ldap_user_filter %>'; +$conf['plugin']['authldap']['userscope'] = '<%= @ldap_user_scope %>'; +$conf['plugin']['authldap']['grouptree'] = '<%= @ldap_group_tree %>'; +$conf['plugin']['authldap']['groupfilter'] = '<%= @ldap_group_filter %>'; +$conf['plugin']['authldap']['groupscope'] = '<%= @ldap_group_scope %>'; +$conf['plugin']['authldap']['starttls'] = <%= @ldap_starttls ? 1 : 0 %>; +$conf['plugin']['authldap']['sso'] = <%= @ldap_use_sso ? 1 : 0 %>; +$conf['plugin']['authldap']['recursive'] = <%= @ldap_recursive_search ? 1 : 0 %>; +$conf['plugin']['authldap']['binddn'] = '<%= @ldap_binddn %>'; +$conf['plugin']['authldap']['bindpw'] = '<%= @ldap_bindpw %>'; +$conf['plugin']['authldap']['referrals'] = <%= @use_referrals ? 1 : 0 %>; +$conf['plugin']['authldap']['mapping']['name'] = '<%= @ldap_mapping_name %>'; +$conf['plugin']['authldap']['mapping']['grps'] = array(); <%- @ldap_mapping_groups.each do |key, value| -%> -$conf['auth']['ldap']['mapping']['grps']['<%= key %>'] = '<%= value %>'; +$conf['plugin']['authldap']['mapping']['grps']['<%= key %>'] = '<%= value %>'; <%- end -%> <%- end -%>