diff options
author | Marcin Siodelski <marcin@isc.org> | 2017-06-02 13:53:38 +0200 |
---|---|---|
committer | Marcin Siodelski <marcin@isc.org> | 2017-06-02 13:53:38 +0200 |
commit | 97d73a1eb4155e72921aa82350fc449b0f3b66a6 (patch) | |
tree | 7680d9c9717d30c20c1973e8ff750fe5c3866d40 /doc | |
parent | [master] Merge branch 'trac5212' (config comments # -> //) (diff) | |
download | kea-97d73a1eb4155e72921aa82350fc449b0f3b66a6.tar.xz kea-97d73a1eb4155e72921aa82350fc449b0f3b66a6.zip |
[5190] Replaced dhcpX-server with dhcpX and d2-server with d2 in CA config.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/examples/agent/simple.json | 6 | ||||
-rw-r--r-- | doc/guide/agent.xml | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/doc/examples/agent/simple.json b/doc/examples/agent/simple.json index 1fafb4ca73..819ae82154 100644 --- a/doc/examples/agent/simple.json +++ b/doc/examples/agent/simple.json @@ -19,14 +19,14 @@ "control-sockets": { // This is how the Agent can communicate with the DHCPv4 server. - "dhcp4-server": + "dhcp4": { "socket-type": "unix", "socket-name": "/path/to/the/unix/socket-v4" }, // Location of the DHCPv6 command channel socket. - "dhcp6-server": + "dhcp6": { "socket-type": "unix", "socket-name": "/path/to/the/unix/socket-v6" @@ -35,7 +35,7 @@ // Currently DHCP-DDNS (nicknamed D2) does not support // command channel yet, but we hope this will change in the // future. - "d2-server": + "d2": { "socket-type": "unix", "socket-name": "/path/to/the/unix/socket-d2" diff --git a/doc/guide/agent.xml b/doc/guide/agent.xml index c10d7e5eeb..34b586ad34 100644 --- a/doc/guide/agent.xml +++ b/doc/guide/agent.xml @@ -65,11 +65,11 @@ "http-port": 8080, "control-sockets": { - "dhcp4-server": { + "dhcp4": { "socket-type": "unix", "socket-name": "/path/to/the/unix/socket-v4" }, - "dhcp6-server": { + "dhcp6": { "socket-type": "unix", "socket-name": "/path/to/the/unix/socket-v4" } @@ -128,8 +128,8 @@ <para> The CA uses unix domain sockets to forward control commands and receive - responses from other Kea services. The <command>dhcp4-server</command>, - <command>dhcp6-server</command> and <command>d2-server</command> maps + responses from other Kea services. The <command>dhcp4</command>, + <command>dhcp6</command> and <command>d2</command> maps specify the files to which unix domain sockets are bound. In case of the configuration above, the CA will connect to the DHCPv4 server via <filename>/path/to/the/unix/socket-v4</filename> to forward the |