raddb: move driver-specific config out from mods-available

Symlinking them into mods-enabled, the location INCLUDEd in mods-available/sql,
breaks the server as it tries to load rlm_<driver>.so, which doesn't exist.
They're only part of a module config, so don't really fit that well in
mods-available.

Additionally, turn the $INCLUDE into an $-INCLUDE to pull the config in if it
exists, rather than having to be locally uncommented. This makes it easier to
configure sql for the first time (especially to get up and running with sqlite).

diff --git a/raddb/README.rst b/raddb/README.rst
index a8c0aa1b8e92e2aea482c759c18ea17a9bff4883..3e8bdcae39da47f1bf1ff9e4f85bf1060e0fb362 100644 (file)
--- a/raddb/README.rst
+++ b/raddb/README.rst
@@ -169,6 +169,13 @@ Please use rlm_sqlcounter with sqlite.
 
 
 rlm_ippool
-~~~~~~~~~~~
+~~~~~~~~~~
 
 Please use rlm_sql_ippool with sqlite.
+
+rlm_sql
+~~~~~~~
+
+Driver-specific options have moved from ``mods-available/sql`` to
+``mods-config/sql/driver/<drivername>``.
+

diff --git a/raddb/mods-available/sql b/raddb/mods-available/sql
index d29a5f055708c80c0a425b9b3e9f1376c5241c21..52f07e2b38f8e6a0e89588b82cf2d4567e7d4f83 100644 (file)
--- a/raddb/mods-available/sql
+++ b/raddb/mods-available/sql
@@ -9,7 +9,7 @@
 #
 #  Driver specific configuration options are located in sql prefix config files
 #
-#       mods-available/sql_<driver>
+#       mods-config/sql/driver/<driver>
 #
 #  Where "driver" is cassandra, db2, firebird, freetds, iodbc, null, mysql
 #  oracle, postgresql, sqlite, unixodbc.
@@ -40,10 +40,10 @@ sql {
        #
        driver = "rlm_sql_${dialect}"
 
-       # Uncomment to include driver specific configuration file
-       # (if one exists)
-       # These config files contain driver specific options.
-#      $INCLUDE ${modenableddir}/${.:name}_${dialect}
+       # Include driver specific configuration file if one
+       # exists. These are in a separate configuration file
+       # in mods-config/sql/driver/<driver>.
+       $-INCLUDE ${modconfdir}/sql/driver/${dialect}
 
        # Connection info:
        #

diff --git a/raddb/mods-available/sql_cassandra b/raddb/mods-config/sql/driver/cassandra
similarity index 100%
rename from raddb/mods-available/sql_cassandra
rename to raddb/mods-config/sql/driver/cassandra

diff --git a/raddb/mods-available/sql_mysql b/raddb/mods-config/sql/driver/mysql
similarity index 100%
rename from raddb/mods-available/sql_mysql
rename to raddb/mods-config/sql/driver/mysql

diff --git a/raddb/mods-available/sql_postgres b/raddb/mods-config/sql/driver/postgres
similarity index 99%
rename from raddb/mods-available/sql_postgres
rename to raddb/mods-config/sql/driver/postgres
index bac474584b6b3631b4d8c46543941b9d9cbcb860..a9f604c9a7011a7569090670f96e99c1dec60b27 100644 (file)
--- a/raddb/mods-available/sql_postgres
+++ b/raddb/mods-config/sql/driver/postgres
@@ -11,7 +11,7 @@ postgresql {
        # unlike MySQL, which has a tls{} connection configuration, postgresql
        # uses its connection parameters - see the radius_db option in
        # the main raddb/mods-available/sql file
-       
+
        # Send application_name to the postgres server
        # Only supported in PG 9.0 and greater. Defaults to no.
 #      send_application_name = yes

diff --git a/raddb/mods-available/sql_sqlite b/raddb/mods-config/sql/driver/sqlite
similarity index 100%
rename from raddb/mods-available/sql_sqlite
rename to raddb/mods-config/sql/driver/sqlite