Commit 26a03aa7 authored by Jonathan Gazeley's avatar Jonathan Gazeley
Browse files

Fix file paths etc for sql query templates

parent f337cf78
...@@ -97,8 +97,10 @@ define freeradius::sql ( ...@@ -97,8 +97,10 @@ define freeradius::sql (
# Install custom query file # Install custom query file
if ($custom_query_file) { if ($custom_query_file) {
$custom_query_file_path = "${fr_moduleconfigpath}/${title}"
::freeradius::config { "${name}-queries.conf": ::freeradius::config { "${name}-queries.conf":
name => "${fr_moduleconfigpath}/${title}", name => $custom_query_file_path,
source => $custom_query_file, source => $custom_query_file,
} }
} }
......
...@@ -86,6 +86,6 @@ sql <%= @name %> { ...@@ -86,6 +86,6 @@ sql <%= @name %> {
nas_table = <%= @nas_table %> nas_table = <%= @nas_table %>
# Read driver-specific configuration # Read driver-specific configuration
$INCLUDE <%if @custom_query_file != '' %><%= @custom_query_file %><% else %><%= @query_file %><% end %> $INCLUDE <%if @custom_query_file != '' %><%= @custom_query_file_path %><% else %><%= @query_file %><% end %>
} }
Supports Markdown
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