Move the configuration into place, too

diff --git a/raddb/all.mk b/raddb/all.mk
index c2d81231495ce3622fc24bdc4c8403196d13a057..e4b9a044a3f55bc7146abe52d215e8f234cff6f4 100644 (file)
--- a/raddb/all.mk
+++ b/raddb/all.mk
@@ -8,7 +8,7 @@ DEFAULT_SITES :=        default inner-tunnel
 LOCAL_SITES :=         $(addprefix raddb/sites-enabled/,$(DEFAULT_SITES))
 
 DEFAULT_MODULES :=     always attr_filter cache_eap chap client \
-                       detail detail.log digest dhcp dynamic_clients eap \
+                       detail detail.log digest dhcp eap \
                        eap_inner echo exec expiration expr files linelog logintime \
                        mschap ntlm_auth pap passwd preprocess radutmp realm \
                        replicate soh sradutmp unix unpack utf8

diff --git a/raddb/mods-available/client b/raddb/mods-available/client
index 73310319e34c0c51204db2454b9fece6321a5ad0..af405abe5efe3999139717121a335cb4dd7c048a 100644 (file)
--- a/raddb/mods-available/client
+++ b/raddb/mods-available/client
@@ -1,8 +1,34 @@
+# -*- text -*-
+#
+#  $Id$
+
+# This module loads RADIUS clients as needed, rather than when the server
+# starts.
+#
+#  There are no configuration entries for this module.  Instead, it
+#  relies on the "client" configuration.  You must:
+#
+#      1) link raddb/sites-enabled/dynamic_clients to
+#         raddb/sites-available/dynamic_clients
+#
+#      2) Define a client network/mask (see top of the above file)
+#
+#      3) uncomment the "directory" entry in that client definition
+#
+#      4) list "client" in the "authorize" section of the
+#         "client' virtual server.  The default example already
+#         does this.
+#
+#      5) put files into the above directory, one per IP.
+#         e.g. file "192.0.2.1" should contain a normal client definition
+#         for a client with IP address 192.0.2.1.
+#
+#  For more documentation, see the file:
+#
+#      raddb/sites-available/dynamic-clients
 #
-#  Currently takes no configuration.  May be used to load static file definitions
-#  in future...
 #
-#  For now allows:
+#  The module also supports maps and the %{client:...} expansion.
 #
 #  map client [<ipaddr>] {
 #      Tmp-String-0 := 'nas_type'
@@ -13,7 +39,6 @@
 # 
 #  "%{client:nas_type}"                        # Expands to client's nas_type (or "" if nas_type not set)
 #  "%{client:<ipaddr>.nas_type}"       # Expands to the specified client's nas_type (or "" if nas_type not set or
-#                                      # client does not exist).
 client {
 
-}
\ No newline at end of file
+}

diff --git a/raddb/mods-available/dynamic_clients b/raddb/mods-available/dynamic_clients
deleted file mode 100644 (file)
index cc2bd5f..0000000
--- a/raddb/mods-available/dynamic_clients
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- text -*-
-#
-#  $Id$
-
-# This module loads RADIUS clients as needed, rather than when the server
-# starts.
-#
-#  There are no configuration entries for this module.  Instead, it
-#  relies on the "client" configuration.  You must:
-#
-#      1) link raddb/sites-enabled/dynamic_clients to
-#         raddb/sites-available/dynamic_clients
-#
-#      2) Define a client network/mask (see top of the above file)
-#
-#      3) uncomment the "directory" entry in that client definition
-#
-#      4) list "dynamic_clients" in the "authorize" section of the
-#         "dynamic_clients' virtual server.  The default example already
-#         does this.
-#
-#      5) put files into the above directory, one per IP.
-#         e.g. file "192.0.2.1" should contain a normal client definition
-#         for a client with IP address 192.0.2.1.
-#
-#  For more documentation, see the file:
-#
-#      raddb/sites-available/dynamic-clients
-#
-dynamic_clients {
-
-}

diff --git a/raddb/sites-available/dynamic-clients b/raddb/sites-available/dynamic-clients
index 0459a7f4b1dc824b1684e9d220a0410c69b3248a..701091879a4bcb606d9a2ca5f2dd82198251e3c8 100644 (file)
--- a/raddb/sites-available/dynamic-clients
+++ b/raddb/sites-available/dynamic-clients
@@ -147,7 +147,7 @@ server dynamic_clients {
                #             and then put one file per IP address in
                #             that directory.
                #
-               dynamic_clients
+               client
 
                #
                #  Example 3: Look the clients up in SQL.