[#3541] reverted change

diff --git a/ChangeLog b/ChangeLog
index d55faaef3db67c01f05846f114e2b1159cfc300d..89204b3bfd2c66fe5bc6623910ded1317feb611a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2350.  [doc]           razvan
+       Updated documentation and examples related to HTTP/HTTPS socket
+       ports used by kea-ctrl-agent, kea-dhcp4, kea-dhcp6, kea-dhcp-ddns
+       and High Availability hook library in order to avoid possible
+       conflicts.
+       (Gitlab #3541)
+
 2349.  [func]          razvan
        The kea-ctrl-agent has been deprecated and it issues a warning
        log message on startup. As of Kea 2.7.2 the Kea servers:

diff --git a/doc/examples/kea4/ha-load-balancing-server1-mt-with-tls.json b/doc/examples/kea4/ha-load-balancing-server1-mt-with-tls.json
index 74af394b0288fb3b470820254545211d1985d2e8..2a89216268472038af266850ca5c1de0337e021d 100644 (file)
--- a/doc/examples/kea4/ha-load-balancing-server1-mt-with-tls.json
+++ b/doc/examples/kea4/ha-load-balancing-server1-mt-with-tls.json
@@ -162,7 +162,7 @@
                             // instance if multi-threading is enabled.
                             // The "http-host" and "http-port" values must be set to different
                             // values then the ones used by the Control Agent.
-                            "url": "http://192.168.56.33:8005",
+                            "url": "http://192.168.56.33:8005/",
                             // Trust anchor aka certificate authority file or directory.
                             "trust-anchor": "/usr/lib/kea/CA.pem",
                             // Client certificate file name.
@@ -183,7 +183,7 @@
                             // to run on the partner's machine if multi-threading is enabled.
                             // The "http-host" and "http-port" values must be set to different
                             // values then the ones used by the Control Agent.
-                            "url": "http://192.168.56.66:8005",
+                            "url": "http://192.168.56.66:8005/",
                             // Trust anchor aka certificate authority file or directory.
                             "trust-anchor": "/usr/lib/kea/CA.pem",
                             // Client certificate file name.

diff --git a/doc/examples/kea4/ha-load-balancing-server2-mt.json b/doc/examples/kea4/ha-load-balancing-server2-mt.json
index 1b910d2fc766d80d6f6cec315bb0e3591afaba01..32643d8278b970af644a02680fa214dcc1f15b15 100644 (file)
--- a/doc/examples/kea4/ha-load-balancing-server2-mt.json
+++ b/doc/examples/kea4/ha-load-balancing-server2-mt.json
@@ -161,7 +161,7 @@
                             // to run on the partner's machine if multi-threading is enabled.
                             // The "http-host" and "http-port" values must be set to different
                             // values then the ones used by the Control Agent.
-                            "url": "http://192.168.56.33:8005",
+                            "url": "http://192.168.56.33:8005/",
                             // The partner is primary. This server is secondary.
                             "role": "primary"
                         },
@@ -173,7 +173,7 @@
                             // instance if multi-threading is enabled.
                             // The "http-host" and "http-port" values must be set to different
                             // values then the ones used by the Control Agent.
-                            "url": "http://192.168.56.66:8005",
+                            "url": "http://192.168.56.66:8005/",
                             // This server is secondary. The other one must be
                             // primary.
                             "role": "secondary"

diff --git a/doc/examples/kea6/ha-hot-standby-server1-with-tls.json b/doc/examples/kea6/ha-hot-standby-server1-with-tls.json
index 328824468341dc0d23c55174112ed94d9008aa5f..19d2b5e5b50441fd2ad45488f628b72814d409f0 100644 (file)
--- a/doc/examples/kea6/ha-hot-standby-server1-with-tls.json
+++ b/doc/examples/kea6/ha-hot-standby-server1-with-tls.json
@@ -94,7 +94,7 @@
                             // Control Agent must run along with this DHCPv6 server
                             // instance and the "http-host" and "http-port" must be
                             // set to the corresponding values.
-                            "url": "http://192.168.56.33:8007",
+                            "url": "http://192.168.56.33:8007/",
                             // This server is primary. The other one must be
                             // standby.
                             "role": "primary"
@@ -106,7 +106,7 @@
                             // channel can be reached. The Control Agent is required
                             // to run on the partner's machine with "http-host" and
                             // "http-port" values set to the corresponding values.
-                            "url": "http://192.168.56.66:8007",
+                            "url": "http://192.168.56.66:8007/",
                             // The partner is standby. This server is primary.
                             "role": "standby"
                         }

diff --git a/doc/examples/kea6/ha-hot-standby-server2.json b/doc/examples/kea6/ha-hot-standby-server2.json
index b3bd9daccd2829d16f4eb52b20d919a4c50825ec..4c1cf1fff41819b2b26d1eada38067af778712a8 100644 (file)
--- a/doc/examples/kea6/ha-hot-standby-server2.json
+++ b/doc/examples/kea6/ha-hot-standby-server2.json
@@ -85,7 +85,7 @@
                             // channel can be reached. The Control Agent is required
                             // to run on the partner's machine with "http-host" and
                             // "http-port" values set to the corresponding values.
-                            "url": "http://192.168.56.33:8007",
+                            "url": "http://192.168.56.33:8007/",
                             // The partner is primary. This server is standby.
                             "role": "primary"
                         },
@@ -96,7 +96,7 @@
                             // Control Agent must run along with this DHCPv6 server
                             // instance and the "http-host" and "http-port" must be
                             // set to the corresponding values.
-                            "url": "http://192.168.56.66:8007",
+                            "url": "http://192.168.56.66:8007/",
                             // This server is standby. The other one must be
                             // primary.
                             "role": "standby"

diff --git a/doc/examples/template-ha-mt-tls/kea-dhcp4-1.conf b/doc/examples/template-ha-mt-tls/kea-dhcp4-1.conf
index 8d485b54e7320e00af854442bbc7eff1d16c1a01..add138055a1dc0d2eb7bf109037acf4cfb2d7b43 100644 (file)
--- a/doc/examples/template-ha-mt-tls/kea-dhcp4-1.conf
+++ b/doc/examples/template-ha-mt-tls/kea-dhcp4-1.conf
@@ -157,7 +157,7 @@
                             // The Control Agent is not needed for the High Availability
                             // with multi-threading, but if it is used, it must use
                             // different values for "http-host" and "http-port".
-                            "url": "http://192.168.1.2:8005",
+                            "url": "http://192.168.1.2:8005/",
                             // Trust anchor aka certificate authority file or directory.
                             "trust-anchor": "/usr/lib/kea/CA.pem",
                             // Client certificate file name.
@@ -177,7 +177,7 @@
                             // The Control Agent is not needed for the High Availability
                             // with multi-threading, but if it is used, it must use
                             // different values for "http-host" and "http-port".
-                            "url": "http://192.168.1.3:8005",
+                            "url": "http://192.168.1.3:8005/",
                             // Trust anchor aka certificate authority file or directory.
                             "trust-anchor": "/usr/lib/kea/CA.pem",
                             // Client certificate file name.

diff --git a/doc/examples/template-ha-mt-tls/kea-dhcp4-2.conf b/doc/examples/template-ha-mt-tls/kea-dhcp4-2.conf
index 48ddc8c2298969ad5e3886e7c672a15122a5dc60..bce555f56cadb8ea6774276cc26871405c6adda0 100644 (file)
--- a/doc/examples/template-ha-mt-tls/kea-dhcp4-2.conf
+++ b/doc/examples/template-ha-mt-tls/kea-dhcp4-2.conf
@@ -157,7 +157,7 @@
                             // The Control Agent is not needed for the High Availability
                             // with multi-threading, but if it is used, it must use
                             // different values for "http-host" and "http-port".
-                            "url": "http://192.168.1.2:8005",
+                            "url": "http://192.168.1.2:8005/",
                             // Trust anchor aka certificate authority file or directory.
                             "trust-anchor": "/usr/lib/kea/CA.pem",
                             // Client certificate file name.
@@ -177,7 +177,7 @@
                             // The Control Agent is not needed for the High Availability
                             // with multi-threading, but if it is used, it must use
                             // different values for "http-host" and "http-port".
-                            "url": "http://192.168.1.3:8005",
+                            "url": "http://192.168.1.3:8005/",
                             // Trust anchor aka certificate authority file or directory.
                             "trust-anchor": "/usr/lib/kea/CA.pem",
                             // Client certificate file name.

diff --git a/doc/examples/template-power-user-home/kea-dhcp4-1.conf b/doc/examples/template-power-user-home/kea-dhcp4-1.conf
index 045ce64fbfcf1742c69adc739675415a40c22dc1..810b182345bf19c099f9b519f2c47498aa41c966 100644 (file)
--- a/doc/examples/template-power-user-home/kea-dhcp4-1.conf
+++ b/doc/examples/template-power-user-home/kea-dhcp4-1.conf
@@ -121,7 +121,7 @@
                             // Control Agent must run along with this DHCPv4 server
                             // instance and the "http-host" and "http-port" must be
                             // set to the corresponding values.
-                            "url": "http://192.168.1.2:8005",
+                            "url": "http://192.168.1.2:8005/",
                             // This server is primary. The other one must be
                             // secondary.
                             "role": "primary"
@@ -133,7 +133,7 @@
                             // channel can be reached. The Control Agent is required
                             // to run on the partner's machine with "http-host" and
                             // "http-port" values set to the corresponding values.
-                            "url": "http://192.168.1.3:8005",
+                            "url": "http://192.168.1.3:8005/",
                             // The other server is secondary. This one must be
                             // primary.
                             "role": "standby"

diff --git a/doc/examples/template-power-user-home/kea-dhcp4-2.conf b/doc/examples/template-power-user-home/kea-dhcp4-2.conf
index 1a932a0a4bc6fed1e09683130e3ce57ebc638a49..9928e8a648feac458d9454d81e3a4d2e1d97c995 100644 (file)
--- a/doc/examples/template-power-user-home/kea-dhcp4-2.conf
+++ b/doc/examples/template-power-user-home/kea-dhcp4-2.conf
@@ -121,7 +121,7 @@
                             // channel can be reached. The Control Agent is required
                             // to run on the partner's machine with "http-host" and
                             // "http-port" values set to the corresponding values.
-                            "url": "http://192.168.1.2:8005",
+                            "url": "http://192.168.1.2:8005/",
                             // The other server is primary. This one must be
                             // secondary.
                             "role": "primary"
@@ -133,7 +133,7 @@
                             // Control Agent must run along with this DHCPv4 server
                             // instance and the "http-host" and "http-port" must be
                             // set to the corresponding values.
-                            "url": "http://192.168.1.3:8005",
+                            "url": "http://192.168.1.3:8005/",
                             // This server is secondary. The other one must be
                             // primary.
                             "role": "standby"

diff --git a/doc/sphinx/arm/hooks-ha.rst b/doc/sphinx/arm/hooks-ha.rst
index 30ffc57599a3260c31c1f22bde8300cd8dc13896..89f4e31ed03f9c651631a90783d0c628808a27a7 100644 (file)
--- a/doc/sphinx/arm/hooks-ha.rst
+++ b/doc/sphinx/arm/hooks-ha.rst
@@ -261,12 +261,12 @@ Server 1:
                    "max-unacked-clients": 5,
                    "peers": [{
                        "name": "server1",
-                       "url": "http://192.168.56.33:8005",
+                       "url": "http://192.168.56.33:8005/",
                        "role": "primary",
                        "auto-failover": true
                    }, {
                        "name": "server2",
-                       "url": "http://192.168.56.66:8005",
+                       "url": "http://192.168.56.66:8005/",
                        "role": "standby",
                        "auto-failover": true
                    }]
@@ -308,12 +308,12 @@ Server 2:
                    "max-unacked-clients": 5,
                    "peers": [{
                        "name": "server1",
-                       "url": "http://192.168.56.33:8005",
+                       "url": "http://192.168.56.33:8005/",
                        "role": "primary",
                        "auto-failover": true
                    }, {
                        "name": "server2",
-                       "url": "http://192.168.56.66:8005",
+                       "url": "http://192.168.56.66:8005/",
                        "role": "standby",
                        "auto-failover": true
                    }]
@@ -687,17 +687,17 @@ only difference that ``this-server-name`` should be set to "server2" and
                    "delayed-updates-limit": 100,
                    "peers": [{
                        "name": "server1",
-                       "url": "http://192.168.56.33:8005",
+                       "url": "http://192.168.56.33:8005/",
                        "role": "primary",
                        "auto-failover": true
                    }, {
                        "name": "server2",
-                       "url": "http://192.168.56.66:8005",
+                       "url": "http://192.168.56.66:8005/",
                        "role": "secondary",
                        "auto-failover": true
                    }, {
                        "name": "server3",
-                       "url": "http://192.168.56.99:8005",
+                       "url": "http://192.168.56.99:8005/",
                        "role": "backup",
                        "basic-auth-user": "foo",
                        "basic-auth-password": "1234",
@@ -1084,17 +1084,17 @@ The following is an example configuration of the primary server in a
                    "max-rejected-lease-updates": 10,
                    "peers": [{
                        "name": "server1",
-                       "url": "http://192.168.56.33:8005",
+                       "url": "http://192.168.56.33:8005/",
                        "role": "primary",
                        "auto-failover": true
                    }, {
                        "name": "server2",
-                       "url": "http://192.168.56.66:8005",
+                       "url": "http://192.168.56.66:8005/",
                        "role": "standby",
                        "auto-failover": true
                    }, {
                        "name": "server3",
-                       "url": "http://192.168.56.99:8005",
+                       "url": "http://192.168.56.99:8005/",
                        "basic-auth-user": "foo",
                        "basic-auth-password": "1234",
                        "role": "backup",
@@ -1165,15 +1165,15 @@ The following is an example configuration file for the primary server in a
                    "wait-backup-ack": false,
                    "peers": [{
                        "name": "server1",
-                       "url": "http://192.168.56.33:8005",
+                       "url": "http://192.168.56.33:8005/",
                        "role": "primary"
                    }, {
                        "name": "server2",
-                       "url": "http://192.168.56.66:8005",
+                       "url": "http://192.168.56.66:8005/",
                        "role": "backup"
                    }, {
                        "name": "server3",
-                       "url": "http://192.168.56.99:8005",
+                       "url": "http://192.168.56.99:8005/",
                        "basic-auth-user": "foo",
                        "basic-auth-password": "1234",
                        "role": "backup"
@@ -1287,12 +1287,12 @@ default to ``true``:
                        "peers": [
                            {
                                "name": "server1",
-                               "url": "http://192.168.56.33:8005",
+                               "url": "http://192.168.56.33:8005/",
                                "role": "primary"
                            },
                            {
                                "name": "server2",
-                               "url": "http://192.168.56.66:8005",
+                               "url": "http://192.168.56.66:8005/",
                                "role": "secondary"
                            }
                        ]
@@ -1379,12 +1379,12 @@ single page of leases from 60 seconds to 90 seconds:
                        "peers": [
                            {
                                "name": "server1",
-                               "url": "http://192.168.56.33:8005",
+                               "url": "http://192.168.56.33:8005/",
                                "role": "primary"
                            },
                            {
                                "name": "server2",
-                               "url": "http://192.168.56.66:8005",
+                               "url": "http://192.168.56.66:8005/",
                                "role": "secondary"
                            }
                        ]
@@ -1457,12 +1457,12 @@ the HA state machine to pause in the ``waiting`` state after server startup.
                        "peers": [
                            {
                                "name": "server1",
-                               "url": "http://192.168.56.33:8005",
+                               "url": "http://192.168.56.33:8005/",
                                "role": "primary"
                            },
                            {
                                "name": "server2",
-                               "url": "http://192.168.56.66:8005",
+                               "url": "http://192.168.56.66:8005/",
                                "role": "secondary"
                            }
                        ],
@@ -1512,12 +1512,12 @@ Consider the following configuration:
                        "peers": [
                            {
                                "name": "server1",
-                               "url": "http://192.168.56.33:8005",
+                               "url": "http://192.168.56.33:8005/",
                                "role": "primary"
                            },
                            {
                                "name": "server2",
-                               "url": "http://192.168.56.66:8005",
+                               "url": "http://192.168.56.66:8005/",
                                "role": "secondary"
                            }
                        ],
@@ -1684,7 +1684,7 @@ as illustrated below:
                              // DHCPv4 server open its own socket. Note that it
                              // must be different than the one used by the CA
                              // (typically 8000). In this example, 8005 is used.
-                             "url": "http://192.0.2.1:8005",
+                             "url": "http://192.0.2.1:8005/",
                              // This server is primary. The other one must be
                              // secondary.
                              "role": "primary"
@@ -1697,7 +1697,7 @@ as illustrated below:
                              // DHCPv4 server open its own socket. Note that it
                              // must be different than the one used by the CA
                              // (typically 8000). In this example, 8005 is used.
-                             "url": "http://192.0.2.2:8005",
+                             "url": "http://192.0.2.2:8005/",
                              // The partner is a secondary. This server is a
                              // primary as specified in the previous "peers"
                              // entry and in "this-server-name" before that.
@@ -2461,13 +2461,13 @@ grouped into relationships as in the snippet below:
                                 "peers": [
                                     {
                                         "name": "server1",
-                                        "url": "http://192.168.56.66:8007",
+                                        "url": "http://192.168.56.66:8007/",
                                         "role": "primary",
                                         "auto-failover": true
                                     },
                                     {
                                         "name": "server2",
-                                        "url": "http://192.168.56.33:8007",
+                                        "url": "http://192.168.56.33:8007/",
                                         "role": "standby",
                                         "auto-failover": true
                                     }
@@ -2485,13 +2485,13 @@ grouped into relationships as in the snippet below:
                                 "peers": [
                                     {
                                         "name": "server3",
-                                        "url": "http://192.168.57.99:8007",
+                                        "url": "http://192.168.57.99:8007/",
                                         "role": "primary",
                                         "auto-failover": true
                                     },
                                     {
                                         "name": "server4",
-                                        "url": "http://192.168.57.33:8007",
+                                        "url": "http://192.168.57.33:8007/",
                                         "role": "standby",
                                         "auto-failover": true
                                     }
@@ -2565,13 +2565,13 @@ branch ``server3``:
                                 "peers": [
                                     {
                                         "name": "server3",
-                                        "url": "http://192.168.57.99:8007",
+                                        "url": "http://192.168.57.99:8007/",
                                         "role": "primary",
                                         "auto-failover": true
                                     },
                                     {
                                         "name": "server4",
-                                        "url": "http://192.168.57.33:8007",
+                                        "url": "http://192.168.57.33:8007/",
                                         "role": "standby",
                                         "auto-failover": true
                                     }