Fix sqltrace/sqllog for FR3

README.md

@@ -682,7 +682,7 @@ Print all SQL statements when in debug mode (-x). Default: `no`.
 ##### `sqltracefile`
 
 Location for SQL statements to be stored if `$sqltrace = yes`. Default:
-`${logdir}/sqltrace.sql`
+`${logdir}/sqllog.sql`
 
 ##### `connect_failure_retry_delay`
 

manifests/sql.pp

@@ -21,7 +21,7 @@ define freeradius::sql (
   $usergroup_table = 'radusergroup',
   $deletestalesessions = 'yes',
   $sqltrace = 'no',
-  $sqltracefile = '${logdir}/sqltrace.sql',
+  $sqltracefile = '${logdir}/sqllog.sql',
   $connect_failure_retry_delay = '60',
   $nas_table = 'nas',
   $read_groups = 'yes',

templates/sql.conf.fr3.erb

@@ -102,7 +102,9 @@ sql <%= @name %> {
 	# by enabling "logfile" there, or global logging by enabling "logfile" here.
 	#
 	# Per-section logging can be disabled by setting "logfile = ''"
-#	logfile = ${logdir}/sqllog.sql
+	<% if @sqltrace == "yes" -%>
+	logfile = <%= @sqltracefile %>
+	<% end -%>
 
 	#  Set the maximum query duration for rlm_sql_mysql and 
 	#  rlm_sql_cassandra.