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

Lint fixes: quoted variables

parent c60414f7
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
define freeradius::krb5 ( define freeradius::krb5 (
$keytab, $keytab,
$principal, $principal,
$start = '${thread[pool].start_servers}', $start = "\${thread[pool].start_servers}",
$min = '${thread[pool].min_spare_servers}', $min = "\${thread[pool].min_spare_servers}",
$max = '${thread[pool].max_servers}', $max = "\${thread[pool].max_servers}",
$spare = '${thread[pool].max_spare_servers}', $spare = "\${thread[pool].max_spare_servers}",
$ensure = 'present', $ensure = 'present',
) { ) {
$fr_package = $::freeradius::params::fr_package $fr_package = $::freeradius::params::fr_package
......
...@@ -10,10 +10,10 @@ define freeradius::ldap ( ...@@ -10,10 +10,10 @@ define freeradius::ldap (
$probes = 3, $probes = 3,
$interval = 3, $interval = 3,
$timeout = 10, $timeout = 10,
$start = '${thread[pool].start_servers}', $start = "\${thread[pool].start_servers}",
$min = '${thread[pool].min_spare_servers}', $min = "\${thread[pool].min_spare_servers}",
$max = '${thread[pool].max_servers}', $max = "\${thread[pool].max_servers}",
$spare = '${thread[pool].max_spare_servers}', $spare = "\${thread[pool].max_spare_servers}",
$ensure = 'present', $ensure = 'present',
$starttls = 'no', $starttls = 'no',
$cafile = undef, $cafile = undef,
......
...@@ -53,10 +53,10 @@ define freeradius::module::ldap ( ...@@ -53,10 +53,10 @@ define freeradius::module::ldap (
Optional[String] $keyfile = undef, Optional[String] $keyfile = undef,
Optional[String] $random_file = undef, Optional[String] $random_file = undef,
Enum['never','allow','demand','hard'] $requirecert = 'allow', Enum['never','allow','demand','hard'] $requirecert = 'allow',
Freeradius::Integer $start = '${thread[pool].start_servers}', Freeradius::Integer $start = "\${thread[pool].start_servers}",
Freeradius::Integer $min = '${thread[pool].min_spare_servers}', Freeradius::Integer $min = "\${thread[pool].min_spare_servers}",
Freeradius::Integer $max = '${thread[pool].max_servers}', Freeradius::Integer $max = "\${thread[pool].max_servers}",
Freeradius::Integer $spare = '${thread[pool].max_spare_servers}', Freeradius::Integer $spare = "\${thread[pool].max_spare_servers}",
Integer $uses = 0, Integer $uses = 0,
Integer $retry_delay = 30, Integer $retry_delay = 30,
Integer $lifetime = 0, Integer $lifetime = 0,
......
...@@ -94,8 +94,8 @@ class freeradius::params { ...@@ -94,8 +94,8 @@ class freeradius::params {
} }
$fr_raddbdir = $::operatingsystemmajrelease ? { $fr_raddbdir = $::operatingsystemmajrelease ? {
'9' => "\${sysconfdir}/freeradius/3.0", '9' => "\${sysconfdir}/freeradius/3.0",
'10' => '\${sysconfdir}/freeradius/3.0', '10' => "\${sysconfdir}/freeradius/3.0",
'buster/sid' => '\${sysconfdir}/freeradius/3.0', 'buster/sid' => "\${sysconfdir}/freeradius/3.0",
'18.04' => "\${sysconfdir}/freeradius/3.0", '18.04' => "\${sysconfdir}/freeradius/3.0",
default => "\${sysconfdir}/freeradius", default => "\${sysconfdir}/freeradius",
} }
......
...@@ -5,7 +5,7 @@ define freeradius::sql ( ...@@ -5,7 +5,7 @@ define freeradius::sql (
$server = 'localhost', $server = 'localhost',
$login = 'radius', $login = 'radius',
$radius_db = '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", $query_file = "\${modconfdir}/\${.:name}/main/\${dialect}/queries.conf",
$custom_query_file = undef, $custom_query_file = undef,
$lifetime = '0', $lifetime = '0',
...@@ -21,7 +21,7 @@ define freeradius::sql ( ...@@ -21,7 +21,7 @@ define freeradius::sql (
$usergroup_table = 'radusergroup', $usergroup_table = 'radusergroup',
$deletestalesessions = 'yes', $deletestalesessions = 'yes',
$sqltrace = 'no', $sqltrace = 'no',
$sqltracefile = '${logdir}/sqllog.sql', $sqltracefile = "\${logdir}/sqllog.sql",
$connect_failure_retry_delay = '60', $connect_failure_retry_delay = '60',
$nas_table = 'nas', $nas_table = 'nas',
$read_groups = 'yes', $read_groups = 'yes',
...@@ -56,7 +56,7 @@ define freeradius::sql ( ...@@ -56,7 +56,7 @@ define freeradius::sql (
unless is_integer($port) { unless is_integer($port) {
fail('$port must be an integer') 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') fail('$num_sql_socks must be an integer')
} }
unless is_integer($lifetime) { unless is_integer($lifetime) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment