Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Projets publics
puppet-freeradius
Commits
dfd405cd
Commit
dfd405cd
authored
Feb 08, 2017
by
Angel L. Mateo
Committed by
Angel L. Mateo
Feb 10, 2017
Browse files
Fix freeradius::module::files
acctusersfile and preproxy_usersfile should be configured by default as undef.
parent
c87de16c
Changes
2
Hide whitespace changes
Inline
Side-by-side
manifests/module/files.pp
View file @
dfd405cd
...
...
@@ -3,16 +3,16 @@
# Create e file module configuration for FreeRADIUS
#
define
freeradius::module::files
(
$ensure
=
'present'
,
String
$moddir
=
"
\$
{modconfdir}/
\$
{.:instance}"
,
Optional
[
String
]
$key
=
undef
,
String
$filename
=
"
\$
{moddir}/authorize"
,
Optional
[
String
]
$usersfile
=
undef
,
String
$acctusersfile
=
"
\$
{moddir}/accounting"
,
String
$preproxy_usersfile
=
"
\$
{moddir}/pre-proxy"
,
Array
[
Hash
]
$users
=
[],
Optional
[
String
]
$source
=
undef
,
Optional
[
String
]
$content
=
undef
,
$ensure
=
'present'
,
String
$moddir
=
"
\$
{modconfdir}/
\$
{.:instance}"
,
Optional
[
String
]
$key
=
undef
,
String
$filename
=
"
\$
{moddir}/authorize"
,
Optional
[
String
]
$usersfile
=
undef
,
Optional
[
String
]
$acctusersfile
=
undef
,
Optional
[
String
]
$preproxy_usersfile
=
undef
,
Array
[
Hash
]
$users
=
[],
Optional
[
String
]
$source
=
undef
,
Optional
[
String
]
$content
=
undef
,
)
{
$fr_moduleconfigpath
=
$::freeradius::params::fr_moduleconfigpath
$fr_group
=
$::freeradius::params::fr_group
...
...
templates/files.erb
View file @
dfd405cd
...
...
@@ -34,6 +34,10 @@ files <%= @name %> {
# These are accepted for backwards compatibility.
# They will be renamed in a future release.
<%-
if
@acctusersfile
-%>
acctusersfile = ${moddir}/accounting
<%-
end
-%>
<%-
if
@preproxy_usersfile
-%>
preproxy_usersfile = ${moddir}/pre-proxy
<%-
end
-%>
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment