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 ff53006d0441fca4b26ba099472a0da5406d7921..15c7a3ef1eed445685c220721998c9060c02595b 100644 (file)
--- 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 babcd8587f630a01f56365ee0e4d600e3238e154..35591364f29da8034f16e7634de3534e5164f7a5 100644 (file)
--- 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 6251f3cf47fa008e0987929c32874c2102342afa..caafd91ff7622505ef548f0b380b87e3b1a90176 100644 (file)
--- 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 0f52d4e77f5e03133e38860e494852b5f51e6492..8a855aecdc41a458c9bc7ed6120bcee6db5013f8 100644 (file)
--- 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 fb2cfe0b7a1e6ed59ad87511fc49373d9a818da9..d074dfd433fbb2318fe758859a6af17197d20749 100644 (file)
--- 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 a6a488d4d0a75746eb95226a3ee99d6b95a7ceac..4c8f2a7ace3a451e8cc412089e54c3fbd5d32dcd 100644 (file)
--- 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 5556aa903cb34553551757ebf9bd8c6544c92d32..57705d4eb6ad53034b06ef9d9fed43a7eef921e9 100644 (file)
--- 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 cb7d6f6ab6a454ad09cab6e1c07d9d61c07770fc..aba48f01b510da2bc73ad6522e560bba10e7205f 100644 (file)
--- 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 4790fafae3f9726b31a728efb17c377222e51c3b..7a133a82e8f3f1cc02a8c7ea2fb1f4e0f6db4778 100644 (file)
--- 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 ea72b1b018fc49e502c46fbe2b4aa2cca2d03dac..e5390959f44d93a838fd5a9ec2cd9b45889d3524 100644 (file)
--- 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:
           <itemizedlist>
             <listitem><simpara><command>name</command> of the
             attribute.</simpara></listitem>
-            
+
             <listitem><simpara><command>type</command> of the attribute. Either the type
             or the name must be provided, and the attribute must be defined in the dictionary.</simpara></listitem>
 

diff --git a/doc/guide/hooks.xml b/doc/guide/hooks.xml
index 8dfe69052016409adee139f9f3496d14f64247aa..0dd54288a94e3ae88736a4fbec0ccc92c7b3be85 100644 (file)
--- a/doc/guide/hooks.xml
+++ b/doc/guide/hooks.xml
@@ -178,20 +178,20 @@ $ <userinput>sudo make install</userinput>
       <para>
       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:
 <screen>
-$ <userinput>ls -l /usr/local/lib/hooks/*.so</userinput>
-/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
+$ <userinput>ls -l /usr/local/lib/kea/hooks/*.so</userinput>
+/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
 </screen>
       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.
       </para>
     </section>
 

diff --git a/doc/guide/install.xml b/doc/guide/install.xml
index 4bd42f25bab3908ac5e8c2ebd9e70b73a61cf871..c2bc146971b774ceaf6f5536558a3100413e9f02 100644 (file)
--- a/doc/guide/install.xml
+++ b/doc/guide/install.xml
@@ -55,7 +55,7 @@
           </listitem>
           <listitem>
             <simpara>
-              <filename>lib/hooks</filename> —
+              <filename>lib/kea/hooks</filename> —
               additional hooks libraries.
             </simpara>
           </listitem>