Commit fe4fd491 authored by Jonathan Gazeley's avatar Jonathan Gazeley
Browse files

Lint fixes: quoted variables

parent c60414f7

manifests/krb5.pp

+4 −4
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ 
define freeradius::krb5 (

  $keytab,

  $principal,

  $start       = '${thread[pool].start_servers}',

  $min         = '${thread[pool].min_spare_servers}',

  $max         = '${thread[pool].max_servers}',

  $spare       = '${thread[pool].max_spare_servers}',

  $start       = "\${thread[pool].start_servers}",

  $min         = "\${thread[pool].min_spare_servers}",

  $max         = "\${thread[pool].max_servers}",

  $spare       = "\${thread[pool].max_spare_servers}",

  $ensure      = 'present',

) {

  $fr_package          = $::freeradius::params::fr_package

manifests/ldap.pp

+4 −4
Original line number Diff line number Diff line
@@ -10,10 +10,10 @@ define freeradius::ldap ( 
  $probes      = 3,

  $interval    = 3,

  $timeout     = 10,

  $start       = '${thread[pool].start_servers}',

  $min         = '${thread[pool].min_spare_servers}',

  $max         = '${thread[pool].max_servers}',

  $spare       = '${thread[pool].max_spare_servers}',

  $start       = "\${thread[pool].start_servers}",

  $min         = "\${thread[pool].min_spare_servers}",

  $max         = "\${thread[pool].max_servers}",

  $spare       = "\${thread[pool].max_spare_servers}",

  $ensure      = 'present',

  $starttls    = 'no',

  $cafile      = undef,

manifests/module/ldap.pp

+4 −4
Original line number Diff line number Diff line
@@ -53,10 +53,10 @@ define freeradius::module::ldap ( 
  Optional[String] $keyfile                                           = undef,

  Optional[String] $random_file                                       = undef,

  Enum['never','allow','demand','hard'] $requirecert                  = 'allow',

  Freeradius::Integer $start                                          = '${thread[pool].start_servers}',

  Freeradius::Integer $min                                            = '${thread[pool].min_spare_servers}',

  Freeradius::Integer $max                                            = '${thread[pool].max_servers}',

  Freeradius::Integer $spare                                          = '${thread[pool].max_spare_servers}',

  Freeradius::Integer $start                                          = "\${thread[pool].start_servers}",

  Freeradius::Integer $min                                            = "\${thread[pool].min_spare_servers}",

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

  Freeradius::Integer $spare                                          = "\${thread[pool].max_spare_servers}",

  Integer $uses                                                       = 0,

  Integer $retry_delay                                                = 30,

  Integer $lifetime                                                   = 0,

manifests/params.pp

+2 −2
Original line number Diff line number Diff line
@@ -94,8 +94,8 @@ class freeradius::params { 
      }

      $fr_raddbdir = $::operatingsystemmajrelease ? {

        '9'          => "\${sysconfdir}/freeradius/3.0",

        '10'         => '\${sysconfdir}/freeradius/3.0',

        'buster/sid' => '\${sysconfdir}/freeradius/3.0',

        '10'         => "\${sysconfdir}/freeradius/3.0",

        'buster/sid' => "\${sysconfdir}/freeradius/3.0",

        '18.04'      => "\${sysconfdir}/freeradius/3.0",

        default      => "\${sysconfdir}/freeradius",

      }

manifests/sql.pp

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ define freeradius::sql ( 
  $server                      = 'localhost',

  $login                       = 'radius',

  $radius_db                   = 'radius',

  $num_sql_socks               = '${thread[pool].max_servers}',

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

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

  $custom_query_file           = undef,

  $lifetime                    = '0',
@@ -21,7 +21,7 @@ define freeradius::sql ( 
  $usergroup_table             = 'radusergroup',

  $deletestalesessions         = 'yes',

  $sqltrace                    = 'no',

  $sqltracefile                = '${logdir}/sqllog.sql',

  $sqltracefile                = "\${logdir}/sqllog.sql",

  $connect_failure_retry_delay = '60',

  $nas_table                   = 'nas',

  $read_groups                 = 'yes',
@@ -56,7 +56,7 @@ define freeradius::sql ( 
  unless is_integer($port) {

    fail('$port must be an integer')

  }

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

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

    fail('$num_sql_socks must be an integer')

  }

  unless is_integer($lifetime) {