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

Merge pull request #192 from sircubbi/allow_stdlib9 

bump for stdlib 9
parents 4200f257 3871bcca

manifests/init.pp

+22 −25
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ class freeradius ( 
  Boolean $krb5_support                                        = false,

  Boolean $wpa_supplicant                                      = false,

  Boolean $winbind_support                                     = false,

  String $log_destination          = 'files',

  Enum['files', 'syslog', 'stdout', 'stderr'] $log_destination = 'files',

  Boolean $syslog                                              = false,

  String $syslog_facility                                      = 'daemon',

  Freeradius::Boolean $log_auth                                = 'no',
@@ -37,9 +37,6 @@ class freeradius ( 
    $fr_3_1 = false

  }



  validate_re($log_destination, '^(files|syslog|stdout|stderr)$',

    "log_destination value (${log_destination}) is not a valid value")



  if $control_socket == true {

    warning(@(WARN/L)

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

manifests/module/detail.pp

+1 −5
Original line number Diff line number Diff line
@@ -9,12 +9,8 @@ define freeradius::module::detail ( 
  String $header                                   = '%t',

  Optional[Freeradius::Boolean] $locking           = undef,

  Optional[Freeradius::Boolean] $log_packet_header = undef,

  Array[String] $suppress                          = [],

  Optional[Array[String]] $suppress                = [],

) {

  if $suppress {

    validate_array($suppress)

  }



  freeradius::module { "detail.${name}":

    ensure  => $ensure,

    content => template('freeradius/detail.erb'),

manifests/sql.pp

+30 −41
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ 
define freeradius::sql (

  Enum['mysql', 'mssql', 'oracle', 'postgresql'] $database,

  Freeradius::Password $password,

  Optional[String] $server                       = 'localhost',

  Variant[Stdlib::Host, Stdlib::IP::Address] $server                                = 'localhost',

  Optional[String] $login                                                           = 'radius',

  Optional[String] $radius_db                                                       = 'radius',

  Freeradius::Integer $num_sql_socks             = "\${thread[pool].max_servers}",

  Variant[Freeradius::Integer, Enum["\${thread[pool].max_servers}"]] $num_sql_socks = "\${thread[pool].max_servers}",

  Optional[String] $query_file                                                      = "\${modconfdir}/\${.:name}/main/\${dialect}/queries.conf",

  Optional[String] $custom_query_file                                               = undef,

  Optional[Integer] $lifetime                                                       = 0,
@@ -41,17 +41,6 @@ define freeradius::sql ( 
  $fr_logpath          = $::freeradius::params::fr_logpath

  $fr_moduleconfigpath = $::freeradius::params::fr_moduleconfigpath



  # Validate our inputs

  # Hostnames

  unless (is_domain_name($server) or is_ip_address($server)) {

    fail('$server must be a valid hostname or IP address')

  }



  # Validate integers

  unless is_integer($num_sql_socks) or $num_sql_socks == "\${thread[pool].max_servers}" {

    fail('$num_sql_socks must be an integer')

  }



  # Warn if the user tries to set a FreeRADIUS 3.1.x specific parameter, and

  # we detect that they are not on (or not installing) a FreeRADIUS 3.1.x

  # then show them some errors

manifests/virtual_module.pp

+1 −7
Original line number Diff line number Diff line 
# Define a virtual module, made up of others

define freeradius::virtual_module (

  Array[String] $submodules,

  Array[String, 1] $submodules,

  Freeradius::Ensure $ensure = present,

  Enum['redundant','load-balance','redundant-load-balance','group'] $type = 'redundant-load-balance',

  ) {
@@ -9,12 +9,6 @@ define freeradius::virtual_module ( 
  $fr_basepath = $::freeradius::params::fr_basepath

  $fr_group    = $::freeradius::params::fr_group



  # Make sure $submodules is a non-zero array

  validate_array($submodules)

  if count($submodules) < 1 {

    fail('Must specify at least one $submodule')

  }



  file { "${fr_basepath}/instantiate/${name}":

    ensure  => $ensure,

    mode    => '0640',

metadata.json

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
  "dependencies": [

    {

      "name": "puppetlabs/stdlib",

      "version_requirement": ">=4.0.0 <7.0.0"

      "version_requirement": ">=4.0.0 <10.0.0"

    },

    {

      "name": "puppetlabs/firewall",