Commit 60c6ad3a authored by Jonathan's avatar Jonathan Committed by GitHub
Browse files

Merge pull request #36 from ross-w/rw_fix_puppet4 

Fix compatibility with strict variable checking and version comparison on Puppet 4
parents ba3ccd00 a34dc5f9

manifests/init.pp

+1 −3
Original line number Diff line number Diff line
@@ -13,9 +13,7 @@ class freeradius ( 
  $preserve_mods   = true,

) inherits freeradius::params {



  if ($freeradius::fr_version != 3) {

    fail('This module is only compatible with FreeRADIUS 3')

  }

  validate_re($freeradius::fr_version, '^3', 'This module is only compatible with FreeRADIUS 3')



  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.')

manifests/params.pp

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ class freeradius::params { 
  }



  # Use the FR version fact if defined, otherwise use our best estimate from above

  if $::freeradius_maj_version {

  if getvar('::freeradius_maj_version') {

    $fr_version = $::freeradius_maj_version

  } else {

    $fr_version = $fr_guessversion