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
8c7e6214
Commit
8c7e6214
authored
Feb 01, 2016
by
Jonathan
Browse files
Merge pull request #29 from davidc/master
Look for executable 'freeradius' where 'radiusd' doesn't exist
parents
00d4297c
2c48c3b3
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/facter/freeradius_maj_version.rb
View file @
8c7e6214
...
...
@@ -2,6 +2,9 @@
Facter
.
add
(
:freeradius_maj_version
)
do
setcode
do
version
=
Facter
::
Core
::
Execution
.
exec
(
'radiusd -v'
)
if
version
.
nil?
version
=
Facter
::
Core
::
Execution
.
exec
(
'freeradius -v'
)
end
if
!
version
.
nil?
version
=
version
.
split
(
/\n/
)[
0
].
match
(
/FreeRADIUS Version (\d)\.\d\.\d/
)[
1
].
to_s
end
...
...
lib/facter/freeradius_version.rb
View file @
8c7e6214
...
...
@@ -2,6 +2,9 @@
Facter
.
add
(
:freeradius_version
)
do
setcode
do
version
=
Facter
::
Core
::
Execution
.
exec
(
'radiusd -v'
)
if
version
.
nil?
version
=
Facter
::
Core
::
Execution
.
exec
(
'freeradius -v'
)
end
if
!
version
.
nil?
version
=
version
.
split
(
/\n/
)[
0
].
match
(
/FreeRADIUS Version (\d\.\d\.\d)/
)[
1
].
to_s
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