Skip to content

Commit f835477

Browse files
suzgoldwwencel
authored andcommitted
[#3808] Update ARM for new hooks licensing
1 parent 1fd180b commit f835477

File tree

4 files changed

+49
-32
lines changed

4 files changed

+49
-32
lines changed

doc/sphinx/arm/hooks.rst

Lines changed: 38 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -59,22 +59,21 @@ Installing Hook Packages
5959

6060
.. note::
6161

62-
For more details about installing the Kea Premium Hooks package, please read
62+
For more details about installing the Kea Subscriber Hooks, please read
6363
`this Knowledgebase article <https://kb.isc.org/docs/aa-01587>`__.
6464

65-
Some hook packages are included in the base Kea sources. There is no
65+
Most hook packages are now included in the base Kea sources. There is no
6666
need to do anything special to compile or install them, as they are covered
6767
by the usual building and installation procedures. Please
6868
refer to :ref:`installation` for a general overview of the installation process.
6969

70-
ISC provides several additional premium hooks in the form of packages, which
70+
ISC provides several additional subscriber-only hooks in the form of packages, which
7171
follow a similar installation procedure but with several additional steps.
72-
For our users' convenience, the premium hooks installation procedure is described in this section.
72+
For our users' convenience, the subscriber hooks' installation procedure is described in this section.
7373

7474
1. Download the package; detailed instructions are provided in the KB article
7575
above. The package will be a file with a name similar to
76-
``kea-premium-|release|.tar.gz``. (The name may vary depending on the package
77-
purchased.)
76+
``kea-subscriber-|release|.tar.gz``.
7877

7978
2. Administrators who have the sources for the corresponding version of the
8079
open-source Kea package on their system from the initial Kea installation
@@ -90,20 +89,19 @@ Unpack this tarball:
9089
This will unpack the tarball into the ``kea-|release|`` subdirectory of
9190
the current working directory.
9291

93-
3. Unpack the Kea premium hooks tarball into the same directory where the
92+
3. Unpack the Kea subscriber hooks tarball into the same directory where the
9493
original Kea source is located. Once Kea |release| has been unpacked into a ``kea-|release|``
95-
subdirectory and the Kea premium tarball is in the current directory, the following
96-
steps will unpack the premium tarball into the correct location:
94+
subdirectory and the Kea subscriber tarball is in the current directory, the following
95+
steps will unpack the subscriber tarball into the correct location:
9796

9897
.. parsed-literal::
9998
10099
$ cd kea-|release|
101-
$ tar -xvf ../kea-premium-|release|.tar.gz
100+
$ tar -xvf ../kea-subscriber-|release|.tar.gz
102101
103-
Note that unpacking the Kea premium package puts the files into a
102+
Note that unpacking the Kea subscriber package puts the files into a
104103
directory named ``premium``. Regardless of the name of the package, the
105-
directory is always called ``premium``, although its contents will vary
106-
depending on the hooks package.
104+
directory is always called ``premium``.
107105

108106
4. Run the ``autoreconf`` tools. This step is necessary to update Kea's build
109107
script to include the additional directory. If this tool is not already
@@ -116,7 +114,7 @@ tools. To generate the configure script, please use:
116114

117115
5. Rerun ``configure``, using the same configuration options that were used when
118116
originally building Kea. It is possible to verify that ``configure`` has detected the
119-
premium package by inspecting the summary printed when it exits. The
117+
subscriber package by inspecting the summary printed when it exits. The
120118
first section of the output should look something like this:
121119

122120
.. parsed-literal::
@@ -128,7 +126,7 @@ first section of the output should look something like this:
128126
OS Family: Linux
129127
Using GNU sed: yes
130128
Premium package: yes
131-
Included Hooks: forensic_log flex_id host_cmds
129+
Included Hooks: cb_cmds rbac
132130
133131
The last line indicates which specific hooks were detected. Note that
134132
some hooks may require their own dedicated switches.
@@ -149,9 +147,6 @@ here is using the argument ``-j X``, where ``X`` is the number of available core
149147

150148
$ sudo make install
151149

152-
Note that as part of the installation procedure, the install script
153-
places additional hook libraries and associated files into the ``premium/`` directory.
154-
155150
The installation location of the hook libraries depends on whether the
156151
``--prefix`` parameter was specified in the ``configure`` script. If not,
157152
the default location is ``/usr/local/lib/kea/hooks``. The proper installation
@@ -160,14 +155,35 @@ of the libraries can be verified with this command:
160155
::
161156

162157
$ ls -l /usr/local/lib/kea/hooks/*.so
158+
/usr/local/lib/kea/hooks/libddns_gss_tsig.so
159+
/usr/local/lib/kea/hooks/libdhcp_bootp.so
163160
/usr/local/lib/kea/hooks/libdhcp_class_cmds.so
161+
/usr/local/lib/kea/hooks/libdhcp_ddns_tuning.so
164162
/usr/local/lib/kea/hooks/libdhcp_flex_id.so
165163
/usr/local/lib/kea/hooks/libdhcp_flex_option.so
164+
/usr/local/lib/kea/hooks/libdhcp_ha.so
165+
/usr/local/lib/kea/hooks/libdhcp_host_cache.so
166166
/usr/local/lib/kea/hooks/libdhcp_host_cmds.so
167167
/usr/local/lib/kea/hooks/libdhcp_lease_cmds.so
168+
/usr/local/lib/kea/hooks/libdhcp_lease_query.so
168169
/usr/local/lib/kea/hooks/libdhcp_legal_log.so
170+
/usr/local/lib/kea/hooks/libdhcp_limits.so
171+
/usr/local/lib/kea/hooks/libdhcp_mysql.so
172+
/usr/local/lib/kea/hooks/libdhcp_perfmon.so
173+
/usr/local/lib/kea/hooks/libdhcp_pgsql.so
174+
/usr/local/lib/kea/hooks/libdhcp_ping_check.so
175+
/usr/local/lib/kea/hooks/libdhcp_radius.so
176+
/usr/local/lib/kea/hooks/libdhcp_run_script.so
177+
/usr/local/lib/kea/hooks/libdhcp_stat_cmds.so
169178
/usr/local/lib/kea/hooks/libdhcp_subnet_cmds.so
170179

180+
with the following subscriber libraries:
181+
182+
::
183+
184+
/usr/local/lib/kea/hooks/libdhcp_rbac.so
185+
/usr/local/lib/kea/hooks/libdhcp_cb_cmds.so
186+
171187
The exact list returned depends on the packages installed. If the
172188
directory was specified via ``--prefix``, the hook libraries will be located in
173189
``{prefix directory}/lib/kea/hooks``.
@@ -229,7 +245,7 @@ The default hook libraries installation path is provided in the config report as
229245
}
230246
]
231247

232-
This snipper (on Ubuntu 24.04) is equivalent to:
248+
This snippet (on Ubuntu 24.04) is equivalent to:
233249

234250
::
235251

@@ -324,7 +340,7 @@ User context can store configuration for multiple hooks and comments at once.
324340
Some hooks use user context for a configuration that can be easily edited
325341
without the need to restart the server.
326342

327-
The DDNS Tuning Hook uses user context to configure per-subnet behavior. Here's an example:
343+
The DDNS Tuning hook uses user context to configure per-subnet behavior. Here's an example:
328344

329345
::
330346

@@ -475,8 +491,8 @@ libraries, discussed in the following sections.
475491

476492
.. note::
477493

478-
Some of these libraries are available at no cost with the open source base code; others are
479-
premium libraries available for standalone purchase, while some are only available to organizations
494+
As of Kea 3.0.0, most of these libraries are available at no cost with the open source base code;
495+
a few are only available to organizations
480496
that contribute to Kea's development through paid ISC support contracts. Paid support
481497
includes professional engineering assistance, advance security notifications, input
482498
into ISC's roadmap planning, and many other benefits, while helping

doc/sphinx/arm/install.rst

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,11 @@ can be installed individually, with any of the following packages:
5252

5353
- ``isc-kea-hooks`` — Kea open source DHCP hooks
5454

55-
Kea premium hook packages are not included in the ``isc-kea-hooks`` package.
56-
For ISC customers with access to the premium hooks, those packages have the
57-
``isc-kea-premium-`` prefix. Users wishing to purchase the premium hooks
58-
can find them on ISC's website, at https://www.isc.org/shop/.
55+
The Kea subscriber hook packages are not included in the ``isc-kea-hooks`` package.
56+
For ISC customers with access to the subscriber hooks, those packages have the
57+
``isc-kea-subscriber-`` prefix. For users interested in purchasing professional
58+
support services from ISC and getting access to the subscriber hooks, please
59+
fill out our contact form at https://www.isc.org/contact.
5960

6061
Once installed, the services can be managed through the distribution's
6162
service manager. The services are named: :iscman:`kea-dhcp4`, :iscman:`kea-dhcp6`,

doc/sphinx/arm/logging.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,11 @@ are logged according to the configuration set by the second entry.
126126
The currently defined loggers are listed in the following table. The
127127
"Software Package" column of this table specifies whether the particular
128128
loggers belong to the core Kea code (open source Kea binaries and
129-
libraries), or hook libraries (open source or premium).
129+
libraries), or hook libraries (open source or subscriber).
130130

131131
.. tabularcolumns:: |p{0.2\linewidth}|p{0.2\linewidth}|p{0.6\linewidth}|
132132

133-
.. table:: List of loggers supported by Kea servers and hook libraries shipped with Kea/premium packages
133+
.. table:: List of loggers supported by Kea servers and hook libraries shipped with Kea/subscriber packages
134134
:class: longtable
135135
:widths: 20 20 60
136136

@@ -162,7 +162,7 @@ libraries), or hook libraries (open source or premium).
162162
| | | messages. |
163163
+----------------------------------+---------------------------------------+--------------------------------+
164164
| ``kea-ctrl-agent.rbac-hooks`` | :ischooklib:`libdhcp_rbac.so` | Used to log messages related to|
165-
| | premium hook library | the operation of the RBAC hook |
165+
| | subscriber hook library | the operation of the RBAC hook |
166166
| | | library. |
167167
+----------------------------------+---------------------------------------+--------------------------------+
168168
| ``kea-dhcp4`` | core | The root logger for the DHCPv4 |
@@ -209,7 +209,7 @@ libraries), or hook libraries (open source or premium).
209209
| ``kea-dhcp-ddns.callouts`` | | hook point. |
210210
+----------------------------------+---------------------------------------+--------------------------------+
211211
| ``kea-dhcp4.cb-cmds-hooks``, | :ischooklib:`libdhcp_cb_cmds.so` | Used to log messages related to|
212-
| ``kea-dhcp6.cb-cmds-hooks`` | premium hook library | the operation of the Config |
212+
| ``kea-dhcp6.cb-cmds-hooks`` | subscriber hook library | the operation of the Config |
213213
| | | Backend Commands hook library. |
214214
+----------------------------------+---------------------------------------+--------------------------------+
215215
| ``kea-dhcp4.class-cmds-hooks``, | :ischooklib:`libdhcp_class_cmds.so` | Used to log messages related to|
@@ -388,7 +388,7 @@ libraries), or hook libraries (open source or premium).
388388
| | | hook library. |
389389
+----------------------------------+---------------------------------------+--------------------------------+
390390
| ``kea-dhcp4.stat-cmds-hooks``, | :ischooklib:`libdhcp_stat_cmds.so` | Used to log messages related to|
391-
| ``kea-dhcp6.stat-cmds-hooks`` | opens-source hook library | the operation of the Statistics|
391+
| ``kea-dhcp6.stat-cmds-hooks`` | open-source hook library | the operation of the Statistics|
392392
| | | Commands hook library. In |
393393
| | | general, these pertain to |
394394
| | | loading and unloading the |

doc/sphinx/arm/quickstart.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ or specific packages:
158158
$ apk add isc-kea-dhcp6
159159

160160
or ALL Kea-related packages, including development headers, debug
161-
symbols, and premium hooks (if available):
161+
symbols, and subscriber hooks (if available):
162162

163163
.. list-table::
164164
:stub-columns: 1

0 commit comments

Comments
 (0)