From: Michal Nowikowski Date: Mon, 27 May 2019 16:08:46 +0000 (+0200) Subject: fixed hooks location from lib/hooks to lib/kea/hooks X-Git-Tag: Kea-1.6.0-beta~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb23facd7255422c07f36ac046eb501e8033848d;p=thirdparty%2Fkea.git fixed hooks location from lib/hooks to lib/kea/hooks --- diff --git a/doc/examples/kea4/all-keys-current.json b/doc/examples/kea4/all-keys-current.json index ff53006d04..15c7a3ef1e 100644 --- a/doc/examples/kea4/all-keys-current.json +++ b/doc/examples/kea4/all-keys-current.json @@ -235,7 +235,7 @@ "hooks-libraries": [ { // Location of the hooks library to be loaded. - "library": "/opt/lib/hooks/libdhcp_lease_cmds.so", + "library": "/opt/lib/kea/hooks/libdhcp_lease_cmds.so", // Hook library specific configuration parameters. "parameters": { } diff --git a/doc/examples/kea4/all-keys-stable.json b/doc/examples/kea4/all-keys-stable.json index babcd8587f..35591364f2 100644 --- a/doc/examples/kea4/all-keys-stable.json +++ b/doc/examples/kea4/all-keys-stable.json @@ -235,7 +235,7 @@ "hooks-libraries": [ { // Location of the hooks library to be loaded. - "library": "/opt/lib/hooks/libdhcp_lease_cmds.so", + "library": "/opt/lib/kea/hooks/libdhcp_lease_cmds.so", // Hook library specific configuration parameters. "parameters": { } diff --git a/doc/examples/kea4/ha-load-balancing-primary.json b/doc/examples/kea4/ha-load-balancing-primary.json index 6251f3cf47..caafd91ff7 100644 --- a/doc/examples/kea4/ha-load-balancing-primary.json +++ b/doc/examples/kea4/ha-load-balancing-primary.json @@ -83,12 +83,12 @@ // deliver lease updates to the server as well as synchronize the // lease database after failure. { - "library": "/opt/lib/hooks/libdhcp_lease_cmds.so", + "library": "/opt/lib/kea/hooks/libdhcp_lease_cmds.so", "parameters": { } }, { // The HA hooks library should be loaded. - "library": "/opt/lib/hooks/libdhcp_ha.so", + "library": "/opt/lib/kea/hooks/libdhcp_ha.so", "parameters": { // High Availability configuration is specified for the HA hook library. // Each server should have the same HA configuration, except for the diff --git a/doc/examples/kea4/hooks-radius.json b/doc/examples/kea4/hooks-radius.json index 0f52d4e77f..8a855aecdc 100644 --- a/doc/examples/kea4/hooks-radius.json +++ b/doc/examples/kea4/hooks-radius.json @@ -125,7 +125,7 @@ "hooks-libraries": [ { // Load the flex-id hook library. - "library": "/usr/local/lib/hooks/libdhcp_flex_id.so", + "library": "/usr/local/lib/kea/hooks/libdhcp_flex_id.so", "parameters": { // Take the ID from the AOP option. @@ -141,11 +141,11 @@ // Load the host cache hook library. It is needed by the RADIUS // library to keep the attributes from authorization to later user // for accounting. - "library": "/usr/local/lib/hooks/libdhcp_host_cache.so" + "library": "/usr/local/lib/kea/hooks/libdhcp_host_cache.so" }, { // Load the RADIUS hook library. - "library": "/usr/local/lib/hooks/libdhcp_radius.so", + "library": "/usr/local/lib/kea/hooks/libdhcp_radius.so", "parameters": { // If do not use RFC 4361 diff --git a/doc/examples/kea6/all-keys-current.json b/doc/examples/kea6/all-keys-current.json index fb2cfe0b7a..d074dfd433 100644 --- a/doc/examples/kea6/all-keys-current.json +++ b/doc/examples/kea6/all-keys-current.json @@ -191,7 +191,7 @@ "hooks-libraries": [ { // Location of the hooks library to be loaded. - "library": "/opt/lib/hooks/libdhcp_lease_cmds.so", + "library": "/opt/lib/kea/hooks/libdhcp_lease_cmds.so", // Hook library specific configuration parameters. "parameters": { } diff --git a/doc/examples/kea6/all-keys-stable.json b/doc/examples/kea6/all-keys-stable.json index a6a488d4d0..4c8f2a7ace 100644 --- a/doc/examples/kea6/all-keys-stable.json +++ b/doc/examples/kea6/all-keys-stable.json @@ -191,7 +191,7 @@ "hooks-libraries": [ { // Location of the hooks library to be loaded. - "library": "/opt/lib/hooks/libdhcp_lease_cmds.so", + "library": "/opt/lib/kea/hooks/libdhcp_lease_cmds.so", // Hook library specific configuration parameters. "parameters": { } diff --git a/doc/examples/kea6/ha-hot-standby.json b/doc/examples/kea6/ha-hot-standby.json index 5556aa903c..57705d4eb6 100644 --- a/doc/examples/kea6/ha-hot-standby.json +++ b/doc/examples/kea6/ha-hot-standby.json @@ -40,12 +40,12 @@ // The latter implements high availability feature for Kea. "hooks-libraries": [ { - "library": "/opt/lib/hooks/libdhcp_lease_cmds.so", + "library": "/opt/lib/kea/hooks/libdhcp_lease_cmds.so", "parameters": { } }, { // The HA hooks library should be loaded. - "library": "/opt/lib/hooks/libdhcp_ha.so", + "library": "/opt/lib/kea/hooks/libdhcp_ha.so", "parameters": { // High Availability configuration is specified for the HA hook library. // Each server should have the same HA configuration, except for the @@ -148,4 +148,3 @@ } } - diff --git a/doc/guide/hooks-ha.xml b/doc/guide/hooks-ha.xml index cb7d6f6ab6..aba48f01b5 100644 --- a/doc/guide/hooks-ha.xml +++ b/doc/guide/hooks-ha.xml @@ -420,11 +420,11 @@ "hooks-libraries": [ { - "library": "/usr/lib/hooks/libdhcp_lease_cmds.so", + "library": "/usr/lib/kea/hooks/libdhcp_lease_cmds.so", "parameters": { } }, { - "library": "/usr/lib/hooks/libdhcp_ha.so", + "library": "/usr/lib/kea/hooks/libdhcp_ha.so", "parameters": { "high-availability": [ { "this-server-name": "server1", @@ -703,11 +703,11 @@ "hooks-libraries": [ { - "library": "/usr/lib/hooks/libdhcp_lease_cmds.so", + "library": "/usr/lib/kea/hooks/libdhcp_lease_cmds.so", "parameters": { } }, { - "library": "/usr/lib/hooks/libdhcp_ha.so", + "library": "/usr/lib/kea/hooks/libdhcp_ha.so", "parameters": { "high-availability": [ { @@ -790,11 +790,11 @@ "hooks-libraries": [ { - "library": "/usr/lib/hooks/libdhcp_lease_cmds.so", + "library": "/usr/lib/kea/hooks/libdhcp_lease_cmds.so", "parameters": { } }, { - "library": "/usr/lib/hooks/libdhcp_ha.so", + "library": "/usr/lib/kea/hooks/libdhcp_ha.so", "parameters": { "high-availability": [ { "this-server-name": "server1", @@ -916,11 +916,11 @@ "hooks-libraries": [ { - "library": "/usr/lib/hooks/libdhcp_lease_cmds.so", + "library": "/usr/lib/kea/hooks/libdhcp_lease_cmds.so", "parameters": { } }, { - "library": "/usr/lib/hooks/libdhcp_ha.so", + "library": "/usr/lib/kea/hooks/libdhcp_ha.so", "parameters": { "high-availability": [ { "this-server-name": "server1", @@ -1023,11 +1023,11 @@ "hooks-libraries": [ { - "library": "/usr/lib/hooks/libdhcp_lease_cmds.so", + "library": "/usr/lib/kea/hooks/libdhcp_lease_cmds.so", "parameters": { } }, { - "library": "/usr/lib/hooks/libdhcp_ha.so", + "library": "/usr/lib/kea/hooks/libdhcp_ha.so", "parameters": { "high-availability": [ { "this-server-name": "server1", @@ -1118,11 +1118,11 @@ "hooks-libraries": [ { - "library": "/usr/lib/hooks/libdhcp_lease_cmds.so", + "library": "/usr/lib/kea/hooks/libdhcp_lease_cmds.so", "parameters": { } }, { - "library": "/usr/lib/hooks/libdhcp_ha.so", + "library": "/usr/lib/kea/hooks/libdhcp_ha.so", "parameters": { "high-availability": [ { "this-server-name": "server1", @@ -1182,11 +1182,11 @@ "hooks-libraries": [ { - "library": "/usr/lib/hooks/libdhcp_lease_cmds.so", + "library": "/usr/lib/kea/hooks/libdhcp_lease_cmds.so", "parameters": { } }, { - "library": "/usr/lib/hooks/libdhcp_ha.so", + "library": "/usr/lib/kea/hooks/libdhcp_ha.so", "parameters": { "high-availability": [ { "this-server-name": "server1", diff --git a/doc/guide/hooks-host-cache.xml b/doc/guide/hooks-host-cache.xml index 4790fafae3..7a133a82e8 100644 --- a/doc/guide/hooks-host-cache.xml +++ b/doc/guide/hooks-host-cache.xml @@ -41,7 +41,7 @@ "hooks-libraries": [ { - "library": "/usr/local/lib/hooks/libdhc_host_cache.so", + "library": "/usr/local/lib/kea/hooks/libdhc_host_cache.so", "parameters": { // Tells Kea to never cache more than 1000 hosts. diff --git a/doc/guide/hooks-radius.xml b/doc/guide/hooks-radius.xml index ea72b1b018..e5390959f4 100644 --- a/doc/guide/hooks-radius.xml +++ b/doc/guide/hooks-radius.xml @@ -229,7 +229,7 @@ Package: Extended version: &keaversion; (tarball) OS Family: Linux - Hooks directory: /usr/local/lib/hooks + Hooks directory: /usr/local/lib/kea/hooks Premium hooks: yes Included Hooks: forensic_log flex_id host_cmds subnet_cmds radius host_cache @@ -342,10 +342,10 @@ Please make sure that your compilation has the following: { // Note that RADIUS requires host-cache for proper operation, // so that library is loaded as well. - "library": "/usr/local/lib/hooks/libdhcp_host_cache.so" + "library": "/usr/local/lib/kea/hooks/libdhcp_host_cache.so" }, { - "library": "/usr/local/lib/hooks/libdhc_radius.so", + "library": "/usr/local/lib/kea/hooks/libdhc_radius.so", "parameters": { // Specify where FreeRADIUS dictionary could be located @@ -499,7 +499,7 @@ Please make sure that your compilation has the following: name of the attribute. - + type of the attribute. Either the type or the name must be provided, and the attribute must be defined in the dictionary. diff --git a/doc/guide/hooks.xml b/doc/guide/hooks.xml index 8dfe690520..0dd54288a9 100644 --- a/doc/guide/hooks.xml +++ b/doc/guide/hooks.xml @@ -178,20 +178,20 @@ $ sudo make install The installation location of the hooks libraries depends whether you specified --prefix parameter to the configure script. If you did not, - the default location will be /usr/local/lib/hooks. You can verify the + the default location will be /usr/local/lib/kea/hooks. You can verify the libraries are installed properly with this command: -$ ls -l /usr/local/lib/hooks/*.so -/usr/local/lib/hooks/libdhcp_class_cmds.so -/usr/local/lib/hooks/libdhcp_flex_id.so -/usr/local/lib/hooks/libdhcp_host_cmds.so -/usr/local/lib/hooks/libdhcp_lease_cmds.so -/usr/local/lib/hooks/libdhcp_legal_log.so -/usr/local/lib/hooks/libdhcp_subnet_cmds.so +$ ls -l /usr/local/lib/kea/hooks/*.so +/usr/local/lib/kea/hooks/libdhcp_class_cmds.so +/usr/local/lib/kea/hooks/libdhcp_flex_id.so +/usr/local/lib/kea/hooks/libdhcp_host_cmds.so +/usr/local/lib/kea/hooks/libdhcp_lease_cmds.so +/usr/local/lib/kea/hooks/libdhcp_legal_log.so +/usr/local/lib/kea/hooks/libdhcp_subnet_cmds.so The exact list you see will depend on the packages you have. If you specified directory via --prefix, the hooks libraries - will be located in {prefix directory}/lib/hooks. + will be located in {prefix directory}/lib/kea/hooks. diff --git a/doc/guide/install.xml b/doc/guide/install.xml index 4bd42f25ba..c2bc146971 100644 --- a/doc/guide/install.xml +++ b/doc/guide/install.xml @@ -55,7 +55,7 @@ - lib/hooks — + lib/kea/hooks — additional hooks libraries.