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
96d7bafd
Commit
96d7bafd
authored
Feb 01, 2016
by
Jonathan Gazeley
Browse files
Remove FR2 support from attr.conf
parent
9ba16bc7
Changes
3
Hide whitespace changes
Inline
Side-by-side
manifests/attr.pp
View file @
96d7bafd
...
...
@@ -11,17 +11,9 @@ define freeradius::attr (
$fr_group
=
$::freeradius::params::fr_group
$fr_moduleconfigpath
=
$::freeradius::params::fr_moduleconfigpath
$fr_modulepath
=
$::freeradius::params::fr_modulepath
$fr_version
=
$::freeradius::params::fr_version
# Decide on location for attribute filters
$location
=
$fr_version
?
{
2
=>
$fr_basepath
,
3
=>
"
${fr_moduleconfigpath}
/attr_filter"
,
default
=>
$fr_moduleconfigpath
,
}
# Install the attribute filter snippet
file
{
"
${
location}
/
${name}
"
:
file
{
"
${
fr_moduleconfigpath}
/attr_filter
/
${name}
"
:
ensure
=>
$ensure
,
mode
=>
'0640'
,
owner
=>
'root'
,
...
...
@@ -34,7 +26,7 @@ define freeradius::attr (
# Reference all attribute snippets in one file
concat::fragment
{
"attr-
${name}
"
:
target
=>
"
${fr_modulepath}
/attr_filter"
,
content
=>
template
(
"freeradius/attr.
fr
${fr_version}
.
erb"
),
content
=>
template
(
"freeradius/attr.erb"
),
order
=>
20
,
}
}
templates/attr.
fr3.
erb
→
templates/attr.erb
View file @
96d7bafd
File moved
templates/attr.fr2.erb
deleted
100644 → 0
View file @
9ba16bc7
attr_filter
<%=
@prefix
%>
.
<%=
@name
%>
{
key = %{
<%=
@key
%>
}
attrsfile = ${confdir}/attr.d/
<%=
@name
%>
}
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