Commit bf7cbe3e authored by Jonathan's avatar Jonathan Committed by GitHub
Browse files

Merge pull request #61 from amateo/feature/sql 

Add more parameters to freeradius::sql
parents fc9aed4d f04c558b

README.md

+23 −1
Changes for README.md: 23 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -771,11 +771,33 @@ Number of seconds to dely retrying on a failed database connection (per socket). 


Table to keep radius client info. Default: `nas`.



#### `readclients`

##### `readclients`



Set to `yes` to read radius clients from the database (`$nas_table`) Clients will ONLY be read on server startup. For performance

and security reasons, finding clients via SQL queries CANNOT be done "live" while the server is running. Default: `no`.



##### `pool_start`



Connections to create during module instantiation. Default: 1.



##### `pool_min`



Minimum number of connnections to keep open. Default: 1.



##### `pool_spare`



Spare connections to be left idle. Default: 1.



##### `pool_idle_timeout`



Idle timeout (in seconds). A connection which is unused for this length of time will

be closed. Default: 60.



##### `pool_connect_timeout`



Connection timeout (in seconds). The maximum amount of time to wait for a new

connection to be established. Default: '3.0'.



#### `freeradius::statusclient`



Define RADIUS clients, specifically to connect to the status server for monitoring.

manifests/sql.pp

+18 −1
Changes for manifests/sql.pp: 18 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -27,6 +27,11 @@ define freeradius::sql ( 
  $read_groups                 = 'yes',

  $port                        = '3306',

  $readclients                 = 'no',

  $pool_start                  = 1,

  $pool_min                    = 1,

  $pool_spare                  = 1,

  $pool_idle_timeout           = 60,

  $pool_connect_timeout        = '3.0',

) {

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

  $fr_service          = $::freeradius::params::fr_service
@@ -51,7 +56,7 @@ define freeradius::sql ( 
  unless is_integer($port) {

    fail('$port must be an integer')

  }

  unless is_integer($num_sql_socks) {

  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) {
@@ -63,6 +68,18 @@ define freeradius::sql ( 
  unless is_integer($connect_failure_retry_delay) {

    fail('$connect_failure_retry_delay must be an integer')

  }

  unless is_integer($pool_start_delay) {

    fail('$pool_start_delay must be an integer')

  }

  unless is_integer($pool_min_delay) {

    fail('$pool_min_delay must be an integer')

  }

  unless is_integer($pool_spare_delay) {

    fail('$pool_spare_delay must be an integer')

  }

  unless is_integer($pool_idle_timeout_delay) {

    fail('$pool_idle_timeout_delay must be an integer')

  }



  # Fake booleans (FR uses yes/no instead of true/false)

  unless $deletestalesessions in ['yes', 'no'] {

templates/sql.conf.erb

+5 −5
Changes for templates/sql.conf.erb: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -140,10 +140,10 @@ sql <%= @name %> { 
		#  connections during instantiation it will exit.

		#  Set to 0 to allow the server to start without the

		#  database being available.

		start = 1

    start = <%= @pool_start %>



		#  Minimum number of connections to keep open

		min = 1

    min = <%= @pool_min %>



		#  Maximum number of connections

		#
@@ -162,7 +162,7 @@ sql <%= @name %> { 
		#

		#  NOTE: Idle connections WILL be closed if "idle_timeout"

		#  is set.  This should be less than or equal to "max" above.

		spare = 1

    spare = <%= @pool_spare %>



		#  Number of uses before the connection is closed

		#
@@ -179,7 +179,7 @@ sql <%= @name %> { 


		#  idle timeout (in seconds).  A connection which is

		#  unused for this length of time will be closed.

		idle_timeout = 60

    idle_timeout = <%= @pool_idle_timeout %>



		#  Connection timeout (in seconds).  The maximum amount of

		#  time to wait for a new connection to be established.
@@ -188,7 +188,7 @@ sql <%= @name %> { 
		#    rlm_sql_oracle - Not possible.

		#    rlm_sql_postgresql - Should be set via the radius_db string instead.

		#

		connect_timeout = 3.0

    connect_timeout = <%= @pool_connect_timeout %>



		#  NOTE: All configuration settings are enforced.  If a

		#  connection is closed because of "idle_timeout",