From: Francis Dupont Date: Mon, 7 Oct 2019 18:40:46 +0000 (+0200) Subject: [793-default-port-in-ca-config-does-not-match-default-kea-shell-config] Moved from... X-Git-Tag: Kea-1.7.2~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcd92fdb15dcdf0af3c8bc774c0d2f86362fb3cb;p=thirdparty%2Fkea.git [793-default-port-in-ca-config-does-not-match-default-kea-shell-config] Moved from 8080 to 8000 as the second is the shell and CA default --- diff --git a/doc/examples/https/httpd2/kea-httpd2.conf b/doc/examples/https/httpd2/kea-httpd2.conf index 12197ef086..097a5ba044 100644 --- a/doc/examples/https/httpd2/kea-httpd2.conf +++ b/doc/examples/https/httpd2/kea-httpd2.conf @@ -102,9 +102,9 @@ SSLMutex "file:/usr/local/var/run/apache2/ssl_mutex" # For URLs such as https://kea.example.org/kea, forward the requests - # to http://127.0.0.1:8080 - ProxyPass /kea http://127.0.0.1:8080/ - ProxyPassReverse /kea http://127.0.0.1:8080/ + # to http://127.0.0.1:8000 + ProxyPass /kea http://127.0.0.1:8000/ + ProxyPassReverse /kea http://127.0.0.1:8000/ # Disable connection keep alive between the proxy and Kea because # Kea doesn't support this mechanism. diff --git a/doc/examples/kea4/ha-load-balancing-primary.json b/doc/examples/kea4/ha-load-balancing-primary.json index 3e92951050..24a9faade5 100644 --- a/doc/examples/kea4/ha-load-balancing-primary.json +++ b/doc/examples/kea4/ha-load-balancing-primary.json @@ -127,7 +127,7 @@ // Control Agent must run along with our DHCPv4 server // instance and the "http-host" and "http-port" must be // set to the corresponding values. - "url": "http://192.168.56.33:8080/", + "url": "http://192.168.56.33:8000/", // This server is primary. The other one must be // secondary. "role": "primary" @@ -139,7 +139,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:8080/", + "url": "http://192.168.56.66:8000/", // The partner is a secondary. Our is primary. "role": "secondary" } diff --git a/doc/examples/kea6/ha-hot-standby.json b/doc/examples/kea6/ha-hot-standby.json index f59a573499..e9aff1f565 100644 --- a/doc/examples/kea6/ha-hot-standby.json +++ b/doc/examples/kea6/ha-hot-standby.json @@ -80,7 +80,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:8080/", + "url": "http://192.168.56.33:8000/", // Th partner is primary. Our is standby. "role": "primary" }, @@ -91,7 +91,7 @@ // Control Agent must run along with our DHCPv6 server // instance and the "http-host" and "http-port" must be // set to the corresponding values. - "url": "http://192.168.56.66:8080/", + "url": "http://192.168.56.66:8000/", // Out server is standby. The partner is primary. "role": "standby" } diff --git a/doc/sphinx/arm/agent.rst b/doc/sphinx/arm/agent.rst index 29f624fc61..51bd64aae0 100644 --- a/doc/sphinx/arm/agent.rst +++ b/doc/sphinx/arm/agent.rst @@ -49,7 +49,7 @@ The following example demonstrates the basic CA configuration. { "Control-agent": { "http-host": "10.20.30.40", - "http-port": 8080, + "http-port": 8000, "control-sockets": { "dhcp4": { @@ -86,7 +86,7 @@ The following example demonstrates the basic CA configuration. The ``http-host`` and ``http-port`` parameters specify an IP address and port to which HTTP service will be bound. In the example configuration provided above, the RESTful service will be available under the URL of -``http://10.20.30.40:8080/``. If these parameters are not specified, the +``http://10.20.30.40:8000/``. If these parameters are not specified, the default URL is ``http://127.0.0.1:8000/``. As mentioned in :ref:`agent-overview`, the CA can forward @@ -231,9 +231,9 @@ server enables authentication of the clients using certificates. ssl_verify_client on; # For URLs such as https://kea.example.org/kea, forward the - # requests to http://127.0.0.1:8080. + # requests to http://127.0.0.1:8000. location /kea { - proxy_pass http://127.0.0.1:8080; + proxy_pass http://127.0.0.1:8000; } } } diff --git a/doc/sphinx/arm/hooks-ha.rst b/doc/sphinx/arm/hooks-ha.rst index 7570278ab5..eda75d4fb9 100644 --- a/doc/sphinx/arm/hooks-ha.rst +++ b/doc/sphinx/arm/hooks-ha.rst @@ -360,17 +360,17 @@ with the only difference that ``this-server-name`` should be set to "max-unacked-clients": 5, "peers": [{ "name": "server1", - "url": "http://192.168.56.33:8080/", + "url": "http://192.168.56.33:8000/", "role": "primary", "auto-failover": true }, { "name": "server2", - "url": "http://192.168.56.66:8080/", + "url": "http://192.168.56.66:8000/", "role": "secondary", "auto-failover": true }, { "name": "server3", - "url": "http://192.168.56.99:8080/", + "url": "http://192.168.56.99:8000/", "role": "backup", "auto-failover": false }] @@ -645,17 +645,17 @@ hot-standby configuration: "max-unacked-clients": 5, "peers": [{ "name": "server1", - "url": "http://192.168.56.33:8080/", + "url": "http://192.168.56.33:8000/", "role": "primary", "auto-failover": true }, { "name": "server2", - "url": "http://192.168.56.66:8080/", + "url": "http://192.168.56.66:8000/", "role": "standby", "auto-failover": true }, { "name": "server3", - "url": "http://192.168.56.99:8080/", + "url": "http://192.168.56.99:8000/", "role": "backup", "auto-failover": false }] @@ -751,12 +751,12 @@ controlled by the two boolean parameters ``send-lease-updates`` and "peers": [ { "name": "server1", - "url": "http://192.168.56.33:8080/", + "url": "http://192.168.56.33:8000/", "role": "primary" }, { "name": "server2", - "url": "http://192.168.56.66:8080/", + "url": "http://192.168.56.66:8000/", "role": "secondary" } ] @@ -853,12 +853,12 @@ page of leases from 60 seconds to 90 seconds: "peers": [ { "name": "server1", - "url": "http://192.168.56.33:8080/", + "url": "http://192.168.56.33:8000/", "role": "primary" }, { "name": "server2", - "url": "http://192.168.56.66:8080/", + "url": "http://192.168.56.66:8000/", "role": "secondary" } ] @@ -940,12 +940,12 @@ following configuration causes the HA state machine to pause in the "peers": [ { "name": "server1", - "url": "http://192.168.56.33:8080/", + "url": "http://192.168.56.33:8000/", "role": "primary" }, { "name": "server2", - "url": "http://192.168.56.66:8080/", + "url": "http://192.168.56.66:8000/", "role": "secondary" } ], @@ -1001,12 +1001,12 @@ state. Consider the following configuration: "peers": [ { "name": "server1", - "url": "http://192.168.56.33:8080/", + "url": "http://192.168.56.33:8000/", "role": "primary" }, { "name": "server2", - "url": "http://192.168.56.66:8080/", + "url": "http://192.168.56.66:8000/", "role": "secondary" } ], @@ -1084,7 +1084,7 @@ load-balancing and the hot-standby cases presented in previous sections. { "Control-agent": { "http-host": "192.168.56.33", - "http-port": 8080, + "http-port": 8000, "control-sockets": { "dhcp4": { diff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre index 47b3dcb6da..211b7ffcf5 100644 --- a/src/bin/keactrl/kea-ctrl-agent.conf.pre +++ b/src/bin/keactrl/kea-ctrl-agent.conf.pre @@ -15,10 +15,10 @@ { // This is a basic configuration for the Kea Control Agent. -// RESTful interface to be available at http://127.0.0.1:8080/ +// RESTful interface to be available at http://127.0.0.1:8000/ "Control-agent": { "http-host": "127.0.0.1", - "http-port": 8080, + "http-port": 8000, // Specify location of the files to which the Control Agent // should connect to forward commands to the DHCPv4, DHCPv6