Loading manifests/sql.pp +2 −7 Original line number Diff line number Diff line Loading @@ -35,7 +35,6 @@ define freeradius::sql ( $fr_group = $::freeradius::params::fr_group $fr_logpath = $::freeradius::params::fr_logpath $fr_moduleconfigpath = $::freeradius::params::fr_moduleconfigpath $fr_version = $::freeradius::params::fr_version # Validate our inputs # Validate multiple choice options Loading Loading @@ -80,11 +79,7 @@ define freeradius::sql ( } # Determine default location of query file $queryfile = $fr_version ? { '2' => "${fr_basepath}/sql/${database}/dialup.conf", '3' => "${fr_basepath}/sql/queries.conf", default => "${fr_basepath}/sql/queries.conf", } $queryfile = "${fr_basepath}/sql/queries.conf" # Install custom query file if ($custom_query_file != '') { Loading @@ -101,7 +96,7 @@ define freeradius::sql ( mode => '0640', owner => 'root', group => $fr_group, content => template("freeradius/sql.conf.fr${fr_version}.erb"), content => template('freeradius/sql.conf.erb'), require => [Package[$fr_package], Group[$fr_group]], notify => Service[$fr_service], } Loading templates/sql.conf.fr3.erb→templates/sql.conf.erb +0 −0 File moved. View file templates/sql.conf.fr2.erbdeleted 100644 → 0 +0 −91 Original line number Diff line number Diff line # -*- text -*- ## ## sql.conf -- SQL modules ## ## $Id$ sql <%= @name %> { # Set the database to one of: mysql, mssql, oracle, postgresql database = "<%= @database %>" # Which FreeRADIUS driver to use. driver = "rlm_sql_${database}" # Connection info: server = "<%= @server %>" port = "<%= @port %>" login = "<%= @login %>" password = "<%= @password %>" # Database table configuration for everything except Oracle radius_db = "<%= @radius_db %>" # If you want both stop and start records logged to the # same SQL table, leave this as is. If you want them in # different tables, put the start table in acct_table1 # and stop table in acct_table2 acct_table1 = "<%= @acct_table1 %>" acct_table2 = "<%= @acct_table2 %>" # Allow for storing data after authentication postauth_table = "<%= @postauth_table %>" authcheck_table = "<%= @authcheck_table %>" authreply_table = "<%= @authreply_table %>" groupcheck_table = "<%= @groupcheck_table %>" groupreply_table = "<%= @groupreply_table %>" # Table to keep group info usergroup_table = "<%= @usergroup_table %>" # If set to 'yes' (default) we read the group tables # If set to 'no' the user MUST have Fall-Through = Yes in the radreply table read_groups = <%= @read_groups %> # Remove stale session if checkrad does not see a double login deletestalesessions = <%= @deletestalesessions %> # Print all SQL statements when in debug mode (-x) sqltrace = <%= @sqltrace %> sqltracefile = <%= @sqltracefile %> # number of sql connections to make to server # # Setting this to LESS than the number of threads means # that some threads may starve, and you will see errors # like "No connections available and at max connection limit" # # Setting this to MORE than the number of threads means # that there are more connections than necessary. num_sql_socks = <%= @num_sql_socks %> # number of seconds to dely retrying on a failed database # connection (per_socket) connect_failure_retry_delay = <%= @connect_failure_retry_delay %> # lifetime of an SQL socket. If you are having network issues # such as TCP sessions expiring, you may need to set the socket # lifetime. If set to non-zero, any open connections will be # closed "lifetime" seconds after they were first opened. lifetime = <%= @lifetime %> # Maximum number of queries used by an SQL socket. If you are # having issues with SQL sockets lasting "too long", you can # limit the number of queries performed over one socket. After # "max_qeuries", the socket will be closed. Use 0 for "no limit". max_queries = <%= @max_queries %> # 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. readclients = <%= @readclients %> # Table to keep radius client info nas_table = <%= @nas_table %> # Read driver-specific configuration $INCLUDE <% if @custom_query_file_path %><%= @custom_query_file_path %><% else %><%= @query_file %><% end %> } Loading
manifests/sql.pp +2 −7 Original line number Diff line number Diff line Loading @@ -35,7 +35,6 @@ define freeradius::sql ( $fr_group = $::freeradius::params::fr_group $fr_logpath = $::freeradius::params::fr_logpath $fr_moduleconfigpath = $::freeradius::params::fr_moduleconfigpath $fr_version = $::freeradius::params::fr_version # Validate our inputs # Validate multiple choice options Loading Loading @@ -80,11 +79,7 @@ define freeradius::sql ( } # Determine default location of query file $queryfile = $fr_version ? { '2' => "${fr_basepath}/sql/${database}/dialup.conf", '3' => "${fr_basepath}/sql/queries.conf", default => "${fr_basepath}/sql/queries.conf", } $queryfile = "${fr_basepath}/sql/queries.conf" # Install custom query file if ($custom_query_file != '') { Loading @@ -101,7 +96,7 @@ define freeradius::sql ( mode => '0640', owner => 'root', group => $fr_group, content => template("freeradius/sql.conf.fr${fr_version}.erb"), content => template('freeradius/sql.conf.erb'), require => [Package[$fr_package], Group[$fr_group]], notify => Service[$fr_service], } Loading
templates/sql.conf.fr2.erbdeleted 100644 → 0 +0 −91 Original line number Diff line number Diff line # -*- text -*- ## ## sql.conf -- SQL modules ## ## $Id$ sql <%= @name %> { # Set the database to one of: mysql, mssql, oracle, postgresql database = "<%= @database %>" # Which FreeRADIUS driver to use. driver = "rlm_sql_${database}" # Connection info: server = "<%= @server %>" port = "<%= @port %>" login = "<%= @login %>" password = "<%= @password %>" # Database table configuration for everything except Oracle radius_db = "<%= @radius_db %>" # If you want both stop and start records logged to the # same SQL table, leave this as is. If you want them in # different tables, put the start table in acct_table1 # and stop table in acct_table2 acct_table1 = "<%= @acct_table1 %>" acct_table2 = "<%= @acct_table2 %>" # Allow for storing data after authentication postauth_table = "<%= @postauth_table %>" authcheck_table = "<%= @authcheck_table %>" authreply_table = "<%= @authreply_table %>" groupcheck_table = "<%= @groupcheck_table %>" groupreply_table = "<%= @groupreply_table %>" # Table to keep group info usergroup_table = "<%= @usergroup_table %>" # If set to 'yes' (default) we read the group tables # If set to 'no' the user MUST have Fall-Through = Yes in the radreply table read_groups = <%= @read_groups %> # Remove stale session if checkrad does not see a double login deletestalesessions = <%= @deletestalesessions %> # Print all SQL statements when in debug mode (-x) sqltrace = <%= @sqltrace %> sqltracefile = <%= @sqltracefile %> # number of sql connections to make to server # # Setting this to LESS than the number of threads means # that some threads may starve, and you will see errors # like "No connections available and at max connection limit" # # Setting this to MORE than the number of threads means # that there are more connections than necessary. num_sql_socks = <%= @num_sql_socks %> # number of seconds to dely retrying on a failed database # connection (per_socket) connect_failure_retry_delay = <%= @connect_failure_retry_delay %> # lifetime of an SQL socket. If you are having network issues # such as TCP sessions expiring, you may need to set the socket # lifetime. If set to non-zero, any open connections will be # closed "lifetime" seconds after they were first opened. lifetime = <%= @lifetime %> # Maximum number of queries used by an SQL socket. If you are # having issues with SQL sockets lasting "too long", you can # limit the number of queries performed over one socket. After # "max_qeuries", the socket will be closed. Use 0 for "no limit". max_queries = <%= @max_queries %> # 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. readclients = <%= @readclients %> # Table to keep radius client info nas_table = <%= @nas_table %> # Read driver-specific configuration $INCLUDE <% if @custom_query_file_path %><%= @custom_query_file_path %><% else %><%= @query_file %><% end %> }