Unverified Commit c2d1984e authored by Jonathan's avatar Jonathan Committed by GitHub
Browse files

Merge pull request #149 from djjudas21/validation_fixes 

Fix all current validation errors
parents a4f645af e79c9bfb

lib/facter/freeradius_version.rb

+12 −13
Original line number Diff line number Diff line 
# Grab the FreeRADIUS version from the output of radiusd -v



module Facter::Util::FreeradiusVersion

  class << self

    def version_string

      # Set path to binary for our platform

      dist = Facter.value(:osfamily)

      case dist

      when /RedHat/

        binary = 'radiusd'

      when /Debian/

        binary = 'freeradius'

      binary = case dist

               when %r{RedHat}

                 'radiusd'

               when %r{Debian}

                 'freeradius'

               else

        binary = 'radiusd'

                 'radiusd'

               end



      Facter::Core::Execution.exec("#{binary} -v")
@@ -23,8 +22,8 @@ end 
Facter.add(:freeradius_version) do

  setcode do

    version_string = Facter::Util::FreeradiusVersion.version_string

    if !version_string.nil?

      version = version_string.split(/\n/)[0].match(/FreeRADIUS Version (\d+\.\d+\.\d+)/)[1].to_s

    unless version_string.nil?

      version = version_string.split(%r{\n})[0].match(%r{FreeRADIUS Version (\d+\.\d+\.\d+)})[1].to_s

    end

    version

  end
@@ -34,8 +33,8 @@ end 
Facter.add(:freeradius_maj_version) do

  setcode do

    version_string = Facter::Util::FreeradiusVersion.version_string

    if !version_string.nil?

      majver = version_string.split(/\n/)[0].match(/FreeRADIUS Version (\d+)\.\d+\.\d+/)[1].to_s

    unless version_string.nil?

      majver = version_string.split(%r{\n})[0].match(%r{FreeRADIUS Version (\d+)\.\d+\.\d+})[1].to_s

    end

    majver

  end

manifests/blank.pp

+6 −1
Original line number Diff line number Diff line
@@ -11,6 +11,11 @@ define freeradius::blank { 
    group   => $fr_group,

    require => [File[$fr_basepath], Package[$fr_package], Group[$fr_group]],

    notify  => Service[$fr_service],

    content => '# This file is intentionally left blank to reduce complexity. Blanking it but leaving it present is safer than deleting it, since the package manager will replace some files if they are deleted, leading to unexpected behaviour!',

    content => @(BLANK/L),

      # This file is intentionally left blank to reduce complexity. \

      Blanking it but leaving it present is safer than deleting it, \

      since the package manager will replace some files if they are \

      deleted, leading to unexpected behaviour!

      |-BLANK

  }

}

manifests/client.pp

+15 −1
Original line number Diff line number Diff line
@@ -7,7 +7,21 @@ define freeradius::client ( 
  Optional[Enum['*', 'udp', 'tcp']] $proto           = '*',

  Freeradius::Boolean $require_message_authenticator = 'no',

  Optional[String] $virtual_server                   = undef,

  Optional[Enum['cisco', 'computone', 'livingston', 'juniper', 'max40xx', 'multitech', 'netserver', 'pathras', 'patton', 'portslave', 'tc', 'usrhiper', 'other']] $nastype = undef,

  Optional[Enum[

    'cisco',

    'computone',

    'livingston',

    'juniper',

    'max40xx',

    'multitech',

    'netserver',

    'pathras',

    'patton',

    'portslave',

    'tc',

    'usrhiper',

    'other',

  ]] $nastype = undef,

  Optional[String] $login                            = undef,

  Optional[String] $password                         = undef,

  Optional[String] $coa_server                       = undef,

manifests/home_server.pp

+1 −1
Original line number Diff line number Diff line 
# Configure a home_server for proxy config

define freeradius::home_server (

  Enum['udp', 'tcp'] $proto                              = 'udp',

  String $secret,

  Enum['udp', 'tcp'] $proto                              = 'udp',

  Enum['none', 'status-server', 'request'] $status_check = 'none',

  Enum['auth', 'acct', 'auth+acct', 'coa'] $type         = 'auth',

  Optional[Integer] $check_interval                      = undef,

manifests/init.pp

+11 −6
Original line number Diff line number Diff line
@@ -32,7 +32,11 @@ class freeradius ( 
    "log_destination value (${log_destination}) is not a valid value")



  if $control_socket == true {

    warning('Use of the control_socket parameter in the freeradius class is deprecated. Please use the freeradius::control_socket class instead.')

    warning(@(WARN/L)

      Use of the control_socket parameter in the freeradius class is deprecated. \

      Please use the freeradius::control_socket class instead.

      |-WARN

    )

  }



  # Always restart the service after every module operation
@@ -324,12 +328,13 @@ class freeradius ( 
  # We don't want to create the radiusd user, just add it to the

  # wbpriv group if the user needs winbind support. We depend on

  # the FreeRADIUS package to be sure that the user has been created

  user { $freeradius::fr_user:

    ensure  => present,

    groups  => $winbind_support ? {

  $fr_user_group = $winbind_support ? {

    true    => $freeradius::fr_wbpriv_user,

    default => undef,

    },

  }

  user { $freeradius::fr_user:

    ensure  => present,

    groups  => $fr_user_group,

    require => Package[$freeradius::fr_package],

  }
@@ -344,7 +349,7 @@ class freeradius ( 
  # Syslog rules

  if $syslog == true {

    rsyslog::snippet { '12-radiusd-log':

      content => "if \$programname == \'radiusd\' then ${freeradius::fr_logpath}/radius.log\n\&\~",

      content => "if \$programname == \'radiusd\' then ${freeradius::fr_logpath}/radius.log\n\\&\\~",

    }

  }