From: Alan T. DeKok Date: Sun, 25 Jan 2026 13:02:00 +0000 (-0500) Subject: remove 'raddb/' and fix other issues X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1292cd62d3acb5bc8dfabcd38d126ed64bd989fe;p=thirdparty%2Ffreeradius-server.git remove 'raddb/' and fix other issues --- diff --git a/raddb/certs/Makefile b/raddb/certs/Makefile index 4079a834062..da4dc8d9407 100644 --- a/raddb/certs/Makefile +++ b/raddb/certs/Makefile @@ -1,6 +1,6 @@ ###################################################################### # -# Make file to be installed in /etc/raddb/certs to enable +# Make file to be installed in _confdir_/certs to enable # the easy creation of certificates. # # See the README file in this directory for more information. diff --git a/raddb/mods-available/eap b/raddb/mods-available/eap index e429a8da344..1b2141a92de 100644 --- a/raddb/mods-available/eap +++ b/raddb/mods-available/eap @@ -181,7 +181,7 @@ eap { # # If these certificates have not been auto-generated: # - # cd raddb/certs + # cd _confdir_/certs # make # # These test certificates *SHOULD NOT* be used in a normal diff --git a/raddb/mods-available/eap_inner b/raddb/mods-available/eap_inner index ac0d17afe93..96c312b4ae2 100644 --- a/raddb/mods-available/eap_inner +++ b/raddb/mods-available/eap_inner @@ -159,7 +159,7 @@ eap inner-eap { # # You can create the `inner-server.pem` file by doing: # - # cd raddb/certs + # cd _confdir_/certs # vi inner-server.cnf # make inner-server # diff --git a/raddb/mods-available/files b/raddb/mods-available/files index 410a55ddad3..52ef722ab55 100644 --- a/raddb/mods-available/files +++ b/raddb/mods-available/files @@ -9,7 +9,7 @@ # # The `users` file as located in `mods-config/files/authorize`. (Livingston-style format). # -# See the raddb/mods-config/files/users.adoc file for information +# See the doc/antora/modules/reference/pages/raddb/mods-config/files/users.adoc file for information # on the format of the input file, and how it operates. # diff --git a/raddb/mods-config/files/authorize b/raddb/mods-config/files/authorize index c56f40eff68..7ce9c825104 100644 --- a/raddb/mods-config/files/authorize +++ b/raddb/mods-config/files/authorize @@ -1,3 +1,5 @@ +bob Password.Cleartext := "bob" + # # Configuration file for the rlm_files module. # Please see rlm_files documentation for more information. @@ -81,7 +83,7 @@ # users with spaces in their names, you must also change # the "filter_username" policy to allow spaces. # -# See raddb/policy.d/filter, filter_username {} section. +# See policy.d/filter, filter_username {} section. # #"John Doe" Password.Cleartext := "hello" # Reply-Message = "Hello, %{User-Name}" diff --git a/raddb/mods-config/sql/driver/postgresql b/raddb/mods-config/sql/driver/postgresql index ffd184d4c95..fcfe05ee553 100644 --- a/raddb/mods-config/sql/driver/postgresql +++ b/raddb/mods-config/sql/driver/postgresql @@ -10,7 +10,7 @@ postgresql { # # NOTE: 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 + # the main mods-available/sql file # # diff --git a/raddb/mods-config/sql/main/mysql/setup.sql b/raddb/mods-config/sql/main/mysql/setup.sql index f77dc563255..00eb011c365 100755 --- a/raddb/mods-config/sql/main/mysql/setup.sql +++ b/raddb/mods-config/sql/main/mysql/setup.sql @@ -3,7 +3,7 @@ -- setup.sql -- MySQL commands for creating the RADIUS user. -- -- WARNING: You should change 'localhost' and 'radpass' --- to something else. Also update raddb/mods-available/sql +-- to something else. Also update mods-available/sql -- with the new RADIUS password. -- -- $Id$ diff --git a/raddb/mods-config/sql/main/ndb/setup.sql b/raddb/mods-config/sql/main/ndb/setup.sql index a2d72536e12..e6af7234f45 100644 --- a/raddb/mods-config/sql/main/ndb/setup.sql +++ b/raddb/mods-config/sql/main/ndb/setup.sql @@ -3,7 +3,7 @@ ## admin.sql -- MySQL commands for creating the RADIUS user. ## ## WARNING: You should change 'localhost' and 'radpass' -## to something else. Also update raddb/mods-available/sql +## to something else. Also update mods-available/sql ## with the new RADIUS password. ## ## $Id$ diff --git a/raddb/mods-config/sql/main/postgresql/extras/cisco_h323_db_schema.sql b/raddb/mods-config/sql/main/postgresql/extras/cisco_h323_db_schema.sql index 8f1b1984304..5e3d80deab2 100644 --- a/raddb/mods-config/sql/main/postgresql/extras/cisco_h323_db_schema.sql +++ b/raddb/mods-config/sql/main/postgresql/extras/cisco_h323_db_schema.sql @@ -10,11 +10,11 @@ -- which is designed for simple dialup installations of FreeRadius. -- -- For this schema to work properly you MUST use --- raddb/sql/postgresql/voip-postpaid.conf rather than --- raddb/sql/postgresql/dialup.conf +-- sql/postgresql/voip-postpaid.conf rather than +-- sql/postgresql/dialup.conf -- -- If you wish to do RADIUS Authentication using the same database, --- you MUST use use raddb/sql/postgresql/schema.sql as well as this schema. +-- you MUST use use sql/postgresql/schema.sql as well as this schema. -- -- diff --git a/raddb/mods-config/sql/main/postgresql/setup.sql b/raddb/mods-config/sql/main/postgresql/setup.sql index 6dc9b6375e7..6530c4827fa 100644 --- a/raddb/mods-config/sql/main/postgresql/setup.sql +++ b/raddb/mods-config/sql/main/postgresql/setup.sql @@ -2,7 +2,7 @@ -- setup.sql -- PostgreSQL commands for creating the RADIUS user. -- -- WARNING: You should change 'localhost' and 'radpass' --- to something else. Also update raddb/mods-available/sql +-- to something else. Also update mods-available/sql -- with the new RADIUS password. -- -- WARNING: This example file is untested. Use at your own risk. diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in index b62c618aa1b..620ed57e57e 100644 --- a/raddb/radiusd.conf.in +++ b/raddb/radiusd.conf.in @@ -763,7 +763,7 @@ policy { # match the regular expression: /[a-zA-Z0-9_.]+/ # # It allows you to define new virtual servers simply by placing -# a file into the raddb/sites-enabled/ directory. +# a file into the sites-enabled/ directory. # # All of the other configuration sections like: # diff --git a/raddb/sites-available/challenge b/raddb/sites-available/challenge index 15ca6191b45..efcda5d8272 100644 --- a/raddb/sites-available/challenge +++ b/raddb/sites-available/challenge @@ -63,7 +63,7 @@ authenticate step1 { # # Send an Access-Challenge. - # See raddb/policy.d/control for the definition + # See policy.d/control for the definition # of "challenge" # challenge diff --git a/raddb/sites-available/decoupled-accounting b/raddb/sites-available/decoupled-accounting index 895d594f5fa..6d3d271cd03 100644 --- a/raddb/sites-available/decoupled-accounting +++ b/raddb/sites-available/decoupled-accounting @@ -27,7 +27,7 @@ server write_detail.example.com { # # Write the "detail" files. # - # See raddb/modules/detail.example.com for more info. + # See mods-available/detail.example.com for more info. detail.example.com } diff --git a/raddb/sites-available/dhcp b/raddb/sites-available/dhcp index bdaf2e3bceb..ae39946db4d 100644 --- a/raddb/sites-available/dhcp +++ b/raddb/sites-available/dhcp @@ -3,11 +3,11 @@ # # This is a virtual server that handles DHCP. # -# See raddb/mods-available/sqlippool for the IP Pool configuration. +# See mods-available/sqlippool for the IP Pool configuration. # -# See raddb/mods-config/sql/ippool/ for the schemas. +# See mods-config/sql/ippool/ for the schemas. # -# See raddb/sites-available/dhcp for instructions on how to configure +# See sites-available/dhcp for instructions on how to configure # the DHCP server. # # $Id$ @@ -26,7 +26,7 @@ server dhcp { # If you want it to do real DHCP, change this to 67, and good luck! # # You can also bind the DHCP socket to an interface. -# See below, and raddb/radiusd.conf for examples. +# See below, and radiusd.conf for examples. # # This lets you run *one* DHCP server instance and have it listen on # multiple interfaces, each with a separate policy. @@ -326,9 +326,9 @@ recv Lease-Query { # There is a preconfigured "mac2ip" module setup in # mods-available/mac2ip. To use it do: # -# # cd raddb/ -# # ln -s ../mods-available/mac2ip mods-enabled/mac2ip -# # mkdir mods-config/passwd +# $ cd _confdir_ +# $ ln -s ../mods-available/mac2ip mods-enabled/mac2ip +# $ mkdir mods-config/passwd # # Then create the file mods-config/passwd/mac2ip with the above # format. diff --git a/raddb/sites-available/inner-tunnel b/raddb/sites-available/inner-tunnel index b5eefacfb29..65266c27dad 100644 --- a/raddb/sites-available/inner-tunnel +++ b/raddb/sites-available/inner-tunnel @@ -55,7 +55,7 @@ recv Access-Request { # # outer.request. # - # The following policy in raddb/policy.d/eap can be used + # The following policy in policy.d/eap can be used # to copy attributes over. # # copy_request_to_tunnel diff --git a/raddb/sites-available/ldap_sync b/raddb/sites-available/ldap_sync index 9df4499f455..5e420adf7a6 100644 --- a/raddb/sites-available/ldap_sync +++ b/raddb/sites-available/ldap_sync @@ -101,7 +101,7 @@ # a single persistent search. # # Most options within the listen section are identical to rlm_ldap. -# See /etc/raddb/mods-available/ldap for more detailed descriptions of +# See mods-available/ldap for more detailed descriptions of # configuration items. # server ldap_sync { diff --git a/raddb/sites-available/robust-proxy-accounting b/raddb/sites-available/robust-proxy-accounting index 54ecd6b430c..8efa6e0fbab 100644 --- a/raddb/sites-available/robust-proxy-accounting +++ b/raddb/sites-available/robust-proxy-accounting @@ -83,7 +83,7 @@ realm acct_realm.example.com { } # (4) Define a detail file writer. -# See raddb/modules/detail.example.com +# See mods-available/detail.example.com # (5) Define a virtual server to handle pre/post-proxy re-writing server home.example.com {