mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 22:15:23 +00:00
Code Issues Releases Wiki Activity

[#198,!160] Modify DHCPv4/v6 sections to not recommend combining configs.

Browse Source
This commit is contained in:
Marcin Siodelski
2018-12-11 11:26:49 +01:00
parent 6bc00bbe9d
commit 1cadf94bf6
2 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
doc/guide/dhcp4-srv.xml
View File

@@ -193,12 +193,22 @@ the server; they do not impact its
operation in any way.</para> operation in any way.</para>
<para>The configuration starts in the first line with the initial <para>The configuration starts in the first line with the initial
opening curly bracket (or brace). Each configuration consists of opening curly bracket (or brace). Each configuration must contain an
one or more objects. In this specific example, we have only one object specifying the configuration of the Kea module using it.
object, called Dhcp4. This is a simplified configuration, as usually In the example above this object is called <command>Dhcp4</command>.
there will be additional objects, like <command>Logging</command> or </para>
<command>DhcpDdns</command>, but we omit them now for clarity. The Dhcp4
configuration starts with the <command>"Dhcp4": {</command> line <note>
<para>In the current Kea release it is possible to specify configurations
of multiple modules within a single configuration file, but this is not
recommended and support for it will be removed in the future releases. The
only object, besides the one specifying module configuration, which can
(and usually is) included in the same file is <command>Logging</command>.
However, we don't include this object in the example above for clarity.
</para>
</note>
<para>The Dhcp4 configuration starts with the <command>"Dhcp4": {</command> line
and ends with the corresponding closing brace (in the above example, and ends with the corresponding closing brace (in the above example,
the brace after the last comment). Everything defined between those the brace after the last comment). Everything defined between those
lines is considered to be the Dhcp4 configuration.</para> lines is considered to be the Dhcp4 configuration.</para>

23
doc/guide/dhcp6-srv.xml
View File

@@ -193,13 +193,24 @@ for these and other parameters.</para>
the server; they do not impact its the server; they do not impact its
operation in any way.</para> operation in any way.</para>
<para>The configuration starts in the first line with the initial <para>The configuration starts in the first line with the initial
opening curly bracket (or brace). Each configuration consists of opening curly bracket (or brace). Each configuration must contain an
one or more objects. In this specific example, we have only one object specifying the configuration of the Kea module using it.
object, called Dhcp6. This is a simplified configuration, as usually In the example above this object is called <command>Dhcp6</command>.
there will be additional objects, like <command>Logging</command> or </para>
<command>DhcpDdns</command>, but we omit them now for clarity. The Dhcp6
configuration starts with the <command>"Dhcp6": {</command> line <note>
<para>In the current Kea release it is possible to specify configurations
of multiple modules within a single configuration file, but this is not
recommended and support for it will be removed in the future releases. The
only object, besides the one specifying module configuration, which can
(and usually is) included in the same file is <command>Logging</command>.
However, we don't include this object in the example above for clarity.
</para>
</note>
<para>The Dhcp6 configuration starts with the <command>"Dhcp6": {</command> line
and ends with the corresponding closing brace (in the above example, and ends with the corresponding closing brace (in the above example,
the brace after the last comment). Everything defined between those the brace after the last comment). Everything defined between those
lines is considered to be the Dhcp6 configuration.</para> lines is considered to be the Dhcp6 configuration.</para>