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

Pass through manager and superuser parameters to configuration file

Browse Source
This commit is contained in:
Ben Roberts
2014-11-23 23:39:12 +00:00
parent 3b1b23732e
commit cafc0d0a08
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/config.pp
View File

@@ -39,6 +39,8 @@ class dokuwiki::config (
$use_referrals = $dokuwiki::use_referrals, $use_referrals = $dokuwiki::use_referrals,
$ldap_mapping_name = $dokuwiki::ldap_mapping_name, $ldap_mapping_name = $dokuwiki::ldap_mapping_name,
$ldap_mapping_groups = $dokuwiki::ldap_mapping_groups, $ldap_mapping_groups = $dokuwiki::ldap_mapping_groups,
$manager = $dokuwiki::manager,
$superuser = $dokuwiki::superuser,
) { ) {
if $base_path == '' or $base_path =~ /\/$/ { if $base_path == '' or $base_path =~ /\/$/ {

2
manifests/init.pp
View File

@@ -44,6 +44,8 @@ class dokuwiki (
$use_referrals = $dokuwiki::params::use_referrals, $use_referrals = $dokuwiki::params::use_referrals,
$ldap_mapping_name = $dokuwiki::params::ldap_mapping_name, $ldap_mapping_name = $dokuwiki::params::ldap_mapping_name,
$ldap_mapping_groups = $dokuwiki::params::ldap_mapping_groups, $ldap_mapping_groups = $dokuwiki::params::ldap_mapping_groups,
$manager = $dokuwiki::params::manager,
$superuser = $dokuwiki::params::superuser,
) inherits dokuwiki::params { ) inherits dokuwiki::params {
# Allow a big-endian date format with optional letter suffix # Allow a big-endian date format with optional letter suffix

2
manifests/params.pp
View File

@@ -56,6 +56,8 @@ class dokuwiki::params {
$use_referrals = true $use_referrals = true
$ldap_mapping_name = 'name' $ldap_mapping_name = 'name'
$ldap_mapping_groups = [] $ldap_mapping_groups = []
$manager = ''
$superuser = ''
} }

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

@@ -44,6 +44,6 @@ $conf['auth']['ldap']['mapping']['grps']['<%= key %>'] = '<%= value %>';
$conf['auth']['ldap']['debug'] = 1; $conf['auth']['ldap']['debug'] = 1;
<%- end -%> <%- end -%>
$conf['manager'] = '<%= @management_group %>'; $conf['manager'] = '<%= @manager %>';
$conf['superuser'] = '<%= @management_group %>'; $conf['superuser'] = '<%= @superuser %>';