[5605a] Updated to a running config (cf #5605 for other configs)

diff --git a/.gitmodules b/.gitmodules
new file mode 100644 (file)
index 0000000..e4730c1
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "premium"]
+       path = premium
+       url = ssh://fdupont@repo.isc.org/proj/git/prod/kea-premium.git

diff --git a/doc/examples/kea4/hooks-radius.json b/doc/examples/kea4/hooks-radius.json
index b8a396a94510d1bd09ba1363e9722bf30a7973ec..ab80ffd789219d9a9bf672486e5d43aa903da029 100644 (file)
--- a/doc/examples/kea4/hooks-radius.json
+++ b/doc/examples/kea4/hooks-radius.json
@@ -34,6 +34,35 @@
 // yquem (white, expensive)
 //
 // Address space is 192.0.2.0/24 with 10-99 for reds and 110-199 for whites.
+//
+// Reservations are given here in Kea/JSON style but they must be
+// in the RADIUS server configuration:
+//
+//       {
+//          "flex-id": "'chambertin'",
+//          "ip-address": "192.0.2.10"
+//       },
+//       {
+//          "flex-id": "'margaux'",
+//          "ip-address": "192.0.2.11"
+//       },
+//       {
+//          "flex-id": "'petrus'",
+//          "ip-address": "192.0.2.12"
+//       },
+//       {
+//          "flex-id": "'romanee'",
+//          "ip-address": "192.0.2.13"
+//       },
+//       {
+//          "flex-id": "'montrachet'",
+//          "ip-address": "192.0.2.110"
+//       },
+//       {
+//          "flex-id": "'yquem'",
+//          "ip-address": "192.0.2.111"
+//       }
+//
 
 {"Dhcp4":
 
@@ -89,34 +118,7 @@
           // important to note. This means that to get an address, the
           // client needs to belong to red class, to white class or
           // have an address reserved.
-      ],
-      // Define host reservations for "expensive" wines.
-      // Use quotes in the host id value to say it is textual, not hex.
-      "reservations": [
-         {
-            "flex-id": "'chambertin'",
-            "ip-address": "192.0.2.10"
-         },
-         {
-            "flex-id": "'margaux'",
-            "ip-address": "192.0.2.11"
-         },
-         {
-            "flex-id": "'petrus'",
-            "ip-address": "192.0.2.12"
-         },
-         {
-            "flex-id": "'romanee'",
-            "ip-address": "192.0.2.13"
-         },
-         {
-            "flex-id": "'montrachet'",
-            "ip-address": "192.0.2.110"
-         },
-         {
-            "flex-id": "'yquem'",
-            "ip-address": "192.0.2.111"
-         } ]
+      ]
     } ],
 
   // Set up the hooks libraries.
@@ -158,17 +160,46 @@
 
              // Configure an access (aka authentication/authorization) server.
              "access": {
-                 "server": "127.0.0.1",
-                 "secret": "12345678"
+                 "servers" : [ {
+                    "name": "127.0.0.1",
+                    "port": 1812,
+                    "secret": "testing123"
+                 } ],
+                 "attributes": [ {
+                    "name": "Password",
+                    "data": "French-wine"
+                 } ]
              },
 
              // Configure an accounting server.
              "accounting": {
-                 "server": "127.0.0.1",
-                 "secret": "12345678"
+                 "servers" : [ {
+                    "name": "127.0.0.1",
+                    "port": 1813,
+                    "secret": "testing123"
+                 } ],
+                 "attributes": [ {
+                    "name": "Password",
+                    "data": "French-wine"
+                 } ]
              }
          }
      } ]
-}
+},
+  "Logging": {
+      "loggers": [
+          {
+            "name": "kea-dhcp4",
+            "output_options": [
+                  {
+                      // Change to stderr for debug
+                      "output": "stdout"
+                  }
+              ],
+              // Change to DEBUG for debug
+              "severity": "INFO"
+          }
+      ]
+  }
 
 }

diff --git a/premium b/premium
new file mode 160000 (submodule)
index 0000000..24cdc41
--- /dev/null
+++ b/premium
@@ -0,0 +1 @@
+Subproject commit 24cdc41d8dde0dd60b14d77a5c8a284e0d5ad1e6