From cafc0d0a082a2d8b8151697faa8c3e3a45b9978c Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Sun, 23 Nov 2014 23:39:12 +0000 Subject: [PATCH] Pass through manager and superuser parameters to configuration file --- manifests/config.pp | 2 ++ manifests/init.pp | 2 ++ manifests/params.pp | 2 ++ templates/local.protected.php.erb | 4 ++-- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/manifests/config.pp b/manifests/config.pp index 3b8517f..124d791 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -39,6 +39,8 @@ class dokuwiki::config ( $use_referrals = $dokuwiki::use_referrals, $ldap_mapping_name = $dokuwiki::ldap_mapping_name, $ldap_mapping_groups = $dokuwiki::ldap_mapping_groups, + $manager = $dokuwiki::manager, + $superuser = $dokuwiki::superuser, ) { if $base_path == '' or $base_path =~ /\/$/ { diff --git a/manifests/init.pp b/manifests/init.pp index 8865d8d..8450bda 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -44,6 +44,8 @@ class dokuwiki ( $use_referrals = $dokuwiki::params::use_referrals, $ldap_mapping_name = $dokuwiki::params::ldap_mapping_name, $ldap_mapping_groups = $dokuwiki::params::ldap_mapping_groups, + $manager = $dokuwiki::params::manager, + $superuser = $dokuwiki::params::superuser, ) inherits dokuwiki::params { # Allow a big-endian date format with optional letter suffix diff --git a/manifests/params.pp b/manifests/params.pp index 63c2665..985823d 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -56,6 +56,8 @@ class dokuwiki::params { $use_referrals = true $ldap_mapping_name = 'name' $ldap_mapping_groups = [] + $manager = '' + $superuser = '' } diff --git a/templates/local.protected.php.erb b/templates/local.protected.php.erb index ec968e5..8f6ddbd 100644 --- a/templates/local.protected.php.erb +++ b/templates/local.protected.php.erb @@ -44,6 +44,6 @@ $conf['auth']['ldap']['mapping']['grps']['<%= key %>'] = '<%= value %>'; $conf['auth']['ldap']['debug'] = 1; <%- end -%> -$conf['manager'] = '<%= @management_group %>'; -$conf['superuser'] = '<%= @management_group %>'; +$conf['manager'] = '<%= @manager %>'; +$conf['superuser'] = '<%= @superuser %>';