remove 'raddb/' and fix other issues

diff --git a/raddb/certs/Makefile b/raddb/certs/Makefile
index 4079a8340626d0ebaeb2e1474b2ab147a1361ab0..da4dc8d94075f2110af165e391936e2ca82c85e9 100644 (file)
--- 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 e429a8da3446190af0f890fbcfd52a41c0cf4849..1b2141a92de9868d4d4dd44ff66211d91a96c699 100644 (file)
--- 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 ac0d17afe936f5b7414501f7c356764772b27227..96c312b4ae2ed5991e80563e7a0d9e56b9b6331a 100644 (file)
--- 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 410a55ddad3fc5397a22c728c942035852b7bca7..52ef722ab55d5d7bb148a8c9e0d9a75c93264291 100644 (file)
--- 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 c56f40eff68b77034c8f7c4deed3815633837a7d..7ce9c825104f8d8a5ccc4c3f519586c63468340d 100644 (file)
--- 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 ffd184d4c956609b018fac608f34243205fb4f63..fcfe05ee553d20887d5d6de8a5c23530615a0e18 100644 (file)
--- 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 f77dc56325585999e0ccb0b447da394781409ba0..00eb011c365a932590517162b64131d0696f9504 100755 (executable)
--- 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 a2d72536e128a9c46e88b1054b57a10ce3b19e04..e6af7234f4510b24e0b4c769f9fd107624184bfa 100644 (file)
--- 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 8f1b19843042adcb7ea301be3cec74f93382a1ee..5e3d80deab2c781a7dd7a60df7e1a3d313605813 100644 (file)
--- 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 6dc9b6375e7c106e06634737cf6f96370fe0e84d..6530c4827faed758abbd53a964d7cc5a035e78f9 100644 (file)
--- 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 b62c618aa1b3d6a6b5fbcd06d43b6825ef64e473..620ed57e57ee0c21e81e9e58274bfbc553c9a275 100644 (file)
--- 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 15ca6191b458a25bd804dd8534c7dd86769cc09f..efcda5d82727573d3585e621c97bce1d7a934f88 100644 (file)
--- 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 895d594f5fa7dfeb049e749e360939463d27fe00..6d3d271cd03d320d6dba387083b0e3893be804a6 100644 (file)
--- 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 bdaf2e3bceb87d9336a3e3193ab9f0c28f869906..ae39946db4dc62896ca67e51bb379077f65cc524 100644 (file)
--- 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 b5eefacfb295643352e3b775457057ea3a1db69a..65266c27dad8287af059d5713592e2a8c5022a6a 100644 (file)
--- a/raddb/sites-available/inner-tunnel
+++ b/raddb/sites-available/inner-tunnel
@@ -55,7 +55,7 @@ recv Access-Request {
        #
        #      outer.request.<attribute>
        #
-       #  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 9df4499f45522a80fb285c485f0ab4eddba17603..5e420adf7a6f59e83d5b1acefd10711a6aba23a4 100644 (file)
--- 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 54ecd6b430ce6598d5001a4a5afd7dd8b1856bb1..8efa6e0fbabad749b83192bc15a066d278679b0b 100644 (file)
--- 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 {