Commit b9456f74 authored Nov 26, 2015 by Jonathan

Merge pull request #27 from djjudas21/conditional_facts

Make facts fail gracefully if radiusd is not installed

parents 0dc3a9a4 d8a696e4

lib/facter/freeradius_maj_version.rb

+5 −1

Original line number	Diff line number	Diff line
		# Grab the FreeRADIUS version from the output of radiusd -v
		Facter.add(:freeradius_maj_version) do
		setcode do
		Facter::Core::Execution.exec('radiusd -v').split(/\n/)[0].match(/FreeRADIUS Version (\d)\.\d\.\d/)[1]
		version = Facter::Core::Execution.exec('radiusd -v')
		if !version.nil?
		version = version.split(/\n/)[0].match(/FreeRADIUS Version (\d)\.\d\.\d/)[1].to_s
		end
		version
		end
		end

lib/facter/freeradius_version.rb

+6 −1

Original line number	Diff line number	Diff line
		# Grab the FreeRADIUS version from the output of radiusd -v
		Facter.add(:freeradius_version) do
		setcode do
		Facter::Core::Execution.exec('radiusd -v').split(/\n/)[0].match(/FreeRADIUS Version (\d\.\d\.\d)/)[1]
		version = Facter::Core::Execution.exec('radiusd -v')
		if !version.nil?
		version = version.split(/\n/)[0].match(/FreeRADIUS Version (\d\.\d\.\d)/)[1].to_s
		end
		version
		end
		end