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

Bump dokuwiki to 20170219e

Browse Source
This commit is contained in:
Ben Roberts
2017-09-25 22:16:26 +01:00
parent 84f00126e1
commit 75a9ceaab3
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/params.pp
View File

@@ -8,7 +8,7 @@ class dokuwiki::params {
'Gentoo': { 'Gentoo': {
$package_category = 'www-apps' $package_category = 'www-apps'
$package_name = 'dokuwiki' $package_name = 'dokuwiki'
$version = '20140929a' $version = '20170219e'
$use_webapp_config = true $use_webapp_config = true
$apache_confdir = '/etc/apache2/vhosts.d' $apache_confdir = '/etc/apache2/vhosts.d'
$apache_user = 'apache' $apache_user = 'apache'

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

@@ -19,27 +19,27 @@ $conf['youarehere'] = <%= @youarehere ? 1 : 0 %>;
$conf['updatecheck'] = <%= @updatecheck ? 1 : 0 %>; $conf['updatecheck'] = <%= @updatecheck ? 1 : 0 %>;
# Authentication # Authentication
$conf['openregister'] = $conf['openregister'] = 0;
$conf['authtype'] = '<%= @auth_type %>'; $conf['authtype'] = '<%= @auth_type %>';
<%- if @auth_type == 'authldap' -%> <%- if @auth_type == 'authldap' -%>
$conf['auth']['ldap']['version'] = '<%= @ldap_version %>'; $conf['plugin']['authldap']['version'] = '<%= @ldap_version %>';
$conf['auth']['ldap']['server'] = 'ldap://<%= @ldap_servers.join(" ") %>:389'; $conf['plugin']['authldap']['server'] = 'ldap://<%= @ldap_servers.join(" ") %>:389';
$conf['auth']['ldap']['usertree'] = '<%= @ldap_user_tree %>'; $conf['plugin']['authldap']['usertree'] = '<%= @ldap_user_tree %>';
$conf['auth']['ldap']['userfilter'] = '<%= @ldap_user_filter %>'; $conf['plugin']['authldap']['userfilter'] = '<%= @ldap_user_filter %>';
$conf['auth']['ldap']['userscope'] = '<%= @ldap_user_scope %>'; $conf['plugin']['authldap']['userscope'] = '<%= @ldap_user_scope %>';
$conf['auth']['ldap']['grouptree'] = '<%= @ldap_group_tree %>'; $conf['plugin']['authldap']['grouptree'] = '<%= @ldap_group_tree %>';
$conf['auth']['ldap']['groupfilter'] = '<%= @ldap_group_filter %>'; $conf['plugin']['authldap']['groupfilter'] = '<%= @ldap_group_filter %>';
$conf['auth']['ldap']['groupscope'] = '<%= @ldap_group_scope %>'; $conf['plugin']['authldap']['groupscope'] = '<%= @ldap_group_scope %>';
$conf['auth']['ldap']['starttls'] = <%= @ldap_starttls ? 1 : 0 %>; $conf['plugin']['authldap']['starttls'] = <%= @ldap_starttls ? 1 : 0 %>;
$conf['auth']['ldap']['sso'] = <%= @ldap_use_sso ? 1 : 0 %>; $conf['plugin']['authldap']['sso'] = <%= @ldap_use_sso ? 1 : 0 %>;
$conf['auth']['ldap']['recursive'] = <%= @ldap_recursive_search ? 1 : 0 %>; $conf['plugin']['authldap']['recursive'] = <%= @ldap_recursive_search ? 1 : 0 %>;
$conf['auth']['ldap']['binddn'] = '<%= @ldap_binddn %>'; $conf['plugin']['authldap']['binddn'] = '<%= @ldap_binddn %>';
$conf['auth']['ldap']['bindpw'] = '<%= @ldap_bindpw %>'; $conf['plugin']['authldap']['bindpw'] = '<%= @ldap_bindpw %>';
$conf['auth']['ldap']['referrals'] = <%= @use_referrals ? 1 : 0 %>; $conf['plugin']['authldap']['referrals'] = <%= @use_referrals ? 1 : 0 %>;
$conf['auth']['ldap']['mapping']['name'] = '<%= @ldap_mapping_name %>'; $conf['plugin']['authldap']['mapping']['name'] = '<%= @ldap_mapping_name %>';
$conf['auth']['ldap']['mapping']['grps'] = array(); $conf['plugin']['authldap']['mapping']['grps'] = array();
<%- @ldap_mapping_groups.each do |key, value| -%> <%- @ldap_mapping_groups.each do |key, value| -%>
$conf['auth']['ldap']['mapping']['grps']['<%= key %>'] = '<%= value %>'; $conf['plugin']['authldap']['mapping']['grps']['<%= key %>'] = '<%= value %>';
<%- end -%> <%- end -%>
<%- end -%> <%- end -%>