[#804,!468] Updated server-tag references.

diff --git a/doc/examples/kea4/config-backend.json b/doc/examples/kea4/config-backend.json
index 8ea41f499004135d0d1215d26416eec5074abc36..e97b9df86bbc7f2d266077adcfa95c7895b90635 100644 (file)
--- a/doc/examples/kea4/config-backend.json
+++ b/doc/examples/kea4/config-backend.json
@@ -6,8 +6,10 @@
 { "Dhcp4":
 
 {
-    // Set the server tag for the configuration backend.
-    "server-tag": "my DHCPv4 server",
+    // Set the server tag for the configuration        backend. This instance will
+    // be named server1. Every configuration element that is applicable to
+    // either "all" or "server1" will be used by this instance.
+    "server-tag": "server1",
 
     // Kea is told to listen on ethX interface only.
     "interfaces-config": {
@@ -43,6 +45,14 @@
         "config-fetch-wait-time": 20
     },
 
+    // This defines a control socket. If defined, Kea will open a UNIX socket
+    // and will listen for incoming commands. See section 17 of the Kea ARM for
+    // details.
+    "control-socket": {
+        "socket-type": "unix",
+        "socket-name": "/tmp/kea-dhcp4.sock"
+    },
+
     // Hooks libraries that enable configuration backend are loaded.
     "hooks-libraries": [
         // The libdhcp_mysql_cb.so is required to use MySQL Configuration

diff --git a/doc/examples/kea6/config-backend.json b/doc/examples/kea6/config-backend.json
index 082013e2b7f32d8943c3c67732ceb530bd66bc1d..e56e4a598e5927564bc17693ddf4b68de9862b7b 100644 (file)
--- a/doc/examples/kea6/config-backend.json
+++ b/doc/examples/kea6/config-backend.json
@@ -6,8 +6,10 @@
 { "Dhcp6":
 
 {
-    // Set the server tag for the configuration        backend.
-    "server-tag": "my DHCPv6 server",
+    // Set the server tag for the configuration        backend. This instance will
+    // be named server2. Every configuration element that is applicable to
+    // either "all" or "server2" will be used by this instance.
+    "server-tag": "server2",
 
     // Kea is told to listen on ethX interface only.
     "interfaces-config": {
@@ -43,6 +45,14 @@
         "config-fetch-wait-time": 20
     },
 
+    // This defines a control socket. If defined, Kea will open a UNIX socket
+    // and will listen for incoming commands. See section 17 of the Kea ARM for
+    // details.
+    "control-socket": {
+        "socket-type": "unix",
+        "socket-name": "/tmp/kea-dhcp6.sock"
+    },
+
     // Hooks libraries that enable configuration backend are loaded.
     "hooks-libraries": [
         // The libdhcp_mysql_cb.so is required to use MySQL Configuration

diff --git a/doc/sphinx/arm/config-backend.rst b/doc/sphinx/arm/config-backend.rst
index 0783f490a4f8f4a920c71a6d70a1d9bd1b3fd97b..0edbb1fc55bfcfe7d9303448fd41d84d595ded84 100644 (file)
--- a/doc/sphinx/arm/config-backend.rst
+++ b/doc/sphinx/arm/config-backend.rst
@@ -29,7 +29,7 @@ network grows, the usefulness of the CB becomes obvious.
 A good example of a use case for the CB is a pair of Kea DHCP servers which can be configured
 to support High Availability as described in
 :ref:`high-availability-library`. The configurations of both servers
-(as known as the server tag: the value of the "server-tag" parameter)
+(including the value of the ``server-tag`` parameter)
 are almost exactly the same. They may differ by the server identifier
 and designation of the server as a primary or standby (or secondary).
 They may also differ by the interfaces configuration. Typically, the
@@ -155,7 +155,8 @@ The configuration elements in the database are associated with the servers
 by "server tags". The server tag is an arbitrary string holding the name
 of the Kea server instance. The tags of the DHCPv4 and DHCPv6 servers are
 independent in the database, i.e. the same server tag can be created for
-the DHCPv4 and the DHCPv6 server respectively.
+the DHCPv4 and the DHCPv6 server respectively. The value is configured
+using ``server-tag`` parameter in the Dhcp4 or Dhcp6 scope.
 
 The server definition, which consists of the server tag and the server
 description, must be stored in the configuration database prior to creating