Commit 8c7e6214 authored by Jonathan's avatar Jonathan
Browse files

Merge pull request #29 from davidc/master 

Look for executable 'freeradius' where 'radiusd' doesn't exist
parents 00d4297c 2c48c3b3

lib/facter/freeradius_maj_version.rb

+3 −0
Original line number Diff line number Diff line
@@ -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

+3 −0
Original line number Diff line number Diff line
@@ -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