From: Wlodek Wencel Date: Mon, 9 Sep 2019 16:58:30 +0000 (+0200) Subject: [#795] sockets paths unified between examples and default configs X-Git-Tag: Kea-1.7.1~32 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72c3987dcfcc150dcf70862fd1e2761c272d4c12;p=thirdparty%2Fkea.git [#795] sockets paths unified between examples and default configs --- diff --git a/doc/examples/agent/comments.json b/doc/examples/agent/comments.json index b6a717740e..1f90e1ce55 100644 --- a/doc/examples/agent/comments.json +++ b/doc/examples/agent/comments.json @@ -18,7 +18,7 @@ { "comment": "control socket for DHCP4 server", "socket-type": "unix", - "socket-name": "/path/to/the/unix/socket-v4" + "socket-name": "/tmp/kea4-ctrl-socket" } }, diff --git a/doc/examples/agent/simple.json b/doc/examples/agent/simple.json index bcdd131fe0..7bde939e8f 100644 --- a/doc/examples/agent/simple.json +++ b/doc/examples/agent/simple.json @@ -32,21 +32,21 @@ { "comment": "socket to DHCP4 server", "socket-type": "unix", - "socket-name": "/path/to/the/unix/socket-v4" + "socket-name": "/tmp/kea4-ctrl-socket" }, // Location of the DHCPv6 command channel socket. "dhcp6": { "socket-type": "unix", - "socket-name": "/path/to/the/unix/socket-v6" + "socket-name": "/tmp/kea6-ctrl-socket" }, // Location of the D2 command channel socket. "d2": { "socket-type": "unix", - "socket-name": "/path/to/the/unix/socket-d2", + "socket-name": "/tmp/kea-ddns-ctrl-socket", "user-context": { "in-use": false } } }, diff --git a/doc/examples/ddns/comments.json b/doc/examples/ddns/comments.json index 8726affd9a..a7717d17c8 100644 --- a/doc/examples/ddns/comments.json +++ b/doc/examples/ddns/comments.json @@ -16,7 +16,7 @@ { "comment": "Control channel", "socket-type": "unix", - "socket-name": "/tmp/d2-ctrl-socket" + "socket-name": "/tmp/kea-ddns-ctrl-socket" }, "forward-ddns": diff --git a/doc/examples/ddns/sample1.json b/doc/examples/ddns/sample1.json index 8de7b1b8b8..bb7668e5a0 100644 --- a/doc/examples/ddns/sample1.json +++ b/doc/examples/ddns/sample1.json @@ -36,7 +36,7 @@ "control-socket": { "socket-type": "unix", - "socket-name": "/tmp/d2-ctrl-socket" + "socket-name": "/tmp/kea-ddns-ctrl-socket" }, // diff --git a/doc/examples/ddns/template.json b/doc/examples/ddns/template.json index adced7f062..601e5cf625 100644 --- a/doc/examples/ddns/template.json +++ b/doc/examples/ddns/template.json @@ -25,7 +25,7 @@ // "control-socket": // { // "socket-type": "unix", -// "socket-name": "/tmp/d2-ctrl-socket" +// "socket-name": "/tmp/kea-ddns-ctrl-socket" // }, // diff --git a/doc/examples/kea4/all-keys-netconf.json b/doc/examples/kea4/all-keys-netconf.json index 6792d42d70..5cc9bff32d 100644 --- a/doc/examples/kea4/all-keys-netconf.json +++ b/doc/examples/kea4/all-keys-netconf.json @@ -91,7 +91,7 @@ // Location of the unix domain socket file the DHCPv4 server uses // to receive control commands from the Kea Control Agent or the // local server administrator. - "socket-name": "/tmp/kea-dhcp4-ctrl.sock", + "socket-name": "/tmp/kea4-ctrl-socket", // Control socket type used by the Kea DHCPv4 server. The 'unix' // socket is currently the only supported type. diff --git a/doc/examples/kea4/all-keys.json b/doc/examples/kea4/all-keys.json index 8ead75e037..40609f125a 100644 --- a/doc/examples/kea4/all-keys.json +++ b/doc/examples/kea4/all-keys.json @@ -91,7 +91,7 @@ // Location of the unix domain socket file the DHCPv4 server uses // to receive control commands from the Kea Control Agent or the // local server administrator. - "socket-name": "/tmp/kea-dhcp4-ctrl.sock", + "socket-name": "/tmp/kea4-ctrl-socket", // Control socket type used by the Kea DHCPv4 server. The 'unix' // socket is currently the only supported type. diff --git a/doc/examples/kea4/config-backend.json b/doc/examples/kea4/config-backend.json index ce02a9c151..e9f43fd7de 100644 --- a/doc/examples/kea4/config-backend.json +++ b/doc/examples/kea4/config-backend.json @@ -50,7 +50,7 @@ // details. "control-socket": { "socket-type": "unix", - "socket-name": "/tmp/kea-dhcp4.sock" + "socket-name": "/tmp/kea4-ctrl-socket" }, // Hooks libraries that enable configuration backend are loaded. diff --git a/doc/examples/kea4/ha-load-balancing-primary.json b/doc/examples/kea4/ha-load-balancing-primary.json index caafd91ff7..3e92951050 100644 --- a/doc/examples/kea4/ha-load-balancing-primary.json +++ b/doc/examples/kea4/ha-load-balancing-primary.json @@ -23,7 +23,7 @@ // API between the HA peers. "control-socket": { "socket-type": "unix", - "socket-name": "/tmp/kea-dhcp4-ctrl.sock" + "socket-name": "/tmp/kea4-ctrl-socket" }, // Use Memfile lease database backend to store leases in a CSV file. diff --git a/doc/examples/kea6/all-keys-netconf.json b/doc/examples/kea6/all-keys-netconf.json index 2e3b54583c..4b4230de85 100644 --- a/doc/examples/kea6/all-keys-netconf.json +++ b/doc/examples/kea6/all-keys-netconf.json @@ -56,7 +56,7 @@ // Location of the unix domain socket file the DHCPv6 server uses // to receive control commands from the Kea Control Agent or the // local server administrator. - "socket-name": "/tmp/kea-dhcp6-ctrl.sock", + "socket-name": "/tmp/kea6-ctrl-socket", // Control socket type used by the Kea DHCPv6 server. The 'unix' // socket is currently the only supported type. diff --git a/doc/examples/kea6/all-keys.json b/doc/examples/kea6/all-keys.json index 767e4c0481..c823b3d217 100644 --- a/doc/examples/kea6/all-keys.json +++ b/doc/examples/kea6/all-keys.json @@ -56,7 +56,7 @@ // Location of the unix domain socket file the DHCPv6 server uses // to receive control commands from the Kea Control Agent or the // local server administrator. - "socket-name": "/tmp/kea-dhcp6-ctrl.sock", + "socket-name": "/tmp/kea6-ctrl-socket", // Control socket type used by the Kea DHCPv6 server. The 'unix' // socket is currently the only supported type. diff --git a/doc/examples/kea6/config-backend.json b/doc/examples/kea6/config-backend.json index 9e19284660..1190e9b0b3 100644 --- a/doc/examples/kea6/config-backend.json +++ b/doc/examples/kea6/config-backend.json @@ -50,7 +50,7 @@ // details. "control-socket": { "socket-type": "unix", - "socket-name": "/tmp/kea-dhcp6.sock" + "socket-name": "/tmp/kea6-ctrl-socket" }, // Hooks libraries that enable configuration backend are loaded. diff --git a/doc/examples/kea6/ha-hot-standby.json b/doc/examples/kea6/ha-hot-standby.json index 57705d4eb6..f59a573499 100644 --- a/doc/examples/kea6/ha-hot-standby.json +++ b/doc/examples/kea6/ha-hot-standby.json @@ -21,7 +21,7 @@ // API between the HA peers. "control-socket": { "socket-type": "unix", - "socket-name": "/tmp/kea-dhcp6-ctrl.sock" + "socket-name": "/tmp/kea6-ctrl-socket" }, // Use Memfile lease database backend to store leases in a CSV file. diff --git a/doc/examples/netconf/comments.json b/doc/examples/netconf/comments.json index 7f04e8d3ac..99014e7850 100644 --- a/doc/examples/netconf/comments.json +++ b/doc/examples/netconf/comments.json @@ -20,7 +20,7 @@ { "comment": "using unix/local socket", "socket-type": "unix", - "socket-name": "/path/to/the/unix/socket-v4" + "socket-name": "/tmp/kea4-ctrl-socket" } } }, diff --git a/doc/examples/netconf/kea-dhcp6-operations/BAD-config.xml b/doc/examples/netconf/kea-dhcp6-operations/BAD-config.xml index acf9342d97..5da5cfa5d1 100644 --- a/doc/examples/netconf/kea-dhcp6-operations/BAD-config.xml +++ b/doc/examples/netconf/kea-dhcp6-operations/BAD-config.xml @@ -12,7 +12,7 @@ eth1 - /tmp/kea6-sock + /tmp/kea6-ctrl-socket unix diff --git a/doc/examples/netconf/kea-dhcp6-operations/BAD-schema.xml b/doc/examples/netconf/kea-dhcp6-operations/BAD-schema.xml index 80b5c13203..c17390243e 100644 --- a/doc/examples/netconf/kea-dhcp6-operations/BAD-schema.xml +++ b/doc/examples/netconf/kea-dhcp6-operations/BAD-schema.xml @@ -12,7 +12,7 @@ eth1 - /tmp/kea6-sock + /tmp/kea6-ctrl-socket unix diff --git a/doc/examples/netconf/kea-dhcp6-operations/BAD-translator.xml b/doc/examples/netconf/kea-dhcp6-operations/BAD-translator.xml index a0924cff8d..128693173c 100644 --- a/doc/examples/netconf/kea-dhcp6-operations/BAD-translator.xml +++ b/doc/examples/netconf/kea-dhcp6-operations/BAD-translator.xml @@ -12,7 +12,7 @@ eth1 - /tmp/kea6-sock + /tmp/kea6-ctrl-socket unix bad diff --git a/doc/examples/netconf/kea-dhcp6-operations/boot.json b/doc/examples/netconf/kea-dhcp6-operations/boot.json index 3b55789d29..18d1da8901 100644 --- a/doc/examples/netconf/kea-dhcp6-operations/boot.json +++ b/doc/examples/netconf/kea-dhcp6-operations/boot.json @@ -2,7 +2,7 @@ "Dhcp6": { "control-socket": { "socket-type": "unix", - "socket-name": "/tmp/kea6-sock" + "socket-name": "/tmp/kea6-ctrl-socket" } } } diff --git a/doc/examples/netconf/kea-dhcp6-operations/logging.xml b/doc/examples/netconf/kea-dhcp6-operations/logging.xml index 16024c62e7..7ce04e4682 100644 --- a/doc/examples/netconf/kea-dhcp6-operations/logging.xml +++ b/doc/examples/netconf/kea-dhcp6-operations/logging.xml @@ -12,7 +12,7 @@ 2001:db8::/64 - /tmp/kea6-sock + /tmp/kea6-ctrl-socket unix diff --git a/doc/examples/netconf/kea-dhcp6-operations/netconf.json b/doc/examples/netconf/kea-dhcp6-operations/netconf.json index 8c918065db..1a8cd2113a 100644 --- a/doc/examples/netconf/kea-dhcp6-operations/netconf.json +++ b/doc/examples/netconf/kea-dhcp6-operations/netconf.json @@ -8,7 +8,7 @@ "control-socket": { "socket-type": "unix", - "socket-name": "/tmp/kea6-sock" + "socket-name": "/tmp/kea6-ctrl-socket" } } }, diff --git a/doc/examples/netconf/kea-dhcp6-operations/startup.xml b/doc/examples/netconf/kea-dhcp6-operations/startup.xml index c59934ba1f..b085833b14 100644 --- a/doc/examples/netconf/kea-dhcp6-operations/startup.xml +++ b/doc/examples/netconf/kea-dhcp6-operations/startup.xml @@ -12,7 +12,7 @@ eth1 - /tmp/kea6-sock + /tmp/kea6-ctrl-socket unix diff --git a/doc/examples/netconf/kea-dhcp6-operations/twopools.xml b/doc/examples/netconf/kea-dhcp6-operations/twopools.xml index 719dbc79ed..8fb32c9d94 100644 --- a/doc/examples/netconf/kea-dhcp6-operations/twopools.xml +++ b/doc/examples/netconf/kea-dhcp6-operations/twopools.xml @@ -17,7 +17,7 @@ eth1 - /tmp/kea6-sock + /tmp/kea6-ctrl-socket unix diff --git a/doc/examples/netconf/kea-dhcp6-operations/twosubnets.xml b/doc/examples/netconf/kea-dhcp6-operations/twosubnets.xml index 1a7610017f..ba68a060ad 100644 --- a/doc/examples/netconf/kea-dhcp6-operations/twosubnets.xml +++ b/doc/examples/netconf/kea-dhcp6-operations/twosubnets.xml @@ -21,7 +21,7 @@ eth1 - /tmp/kea6-sock + /tmp/kea6-ctrl-socket unix diff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre index 1c866feff7..47b3dcb6da 100644 --- a/src/bin/keactrl/kea-ctrl-agent.conf.pre +++ b/src/bin/keactrl/kea-ctrl-agent.conf.pre @@ -26,15 +26,15 @@ "control-sockets": { "dhcp4": { "socket-type": "unix", - "socket-name": "/tmp/kea-dhcp4-ctrl.sock" + "socket-name": "/tmp/kea4-ctrl-socket" }, "dhcp6": { "socket-type": "unix", - "socket-name": "/tmp/kea-dhcp6-ctrl.sock" + "socket-name": "/tmp/kea6-ctrl-socket" }, "d2": { "socket-type": "unix", - "socket-name": "/tmp/kea-dhcp-ddns-ctrl.sock" + "socket-name": "/tmp/kea-ddns-ctrl-socket" } }, diff --git a/src/bin/keactrl/kea-dhcp-ddns.conf.pre b/src/bin/keactrl/kea-dhcp-ddns.conf.pre index c1102cacaa..62f4a0f246 100644 --- a/src/bin/keactrl/kea-dhcp-ddns.conf.pre +++ b/src/bin/keactrl/kea-dhcp-ddns.conf.pre @@ -23,7 +23,7 @@ "port": 53001, "control-socket": { "socket-type": "unix", - "socket-name": "/tmp/kea-dhcp-ddns-ctrl.sock" + "socket-name": "/tmp/ddns-ctrl-socket" }, "tsig-keys": [], "forward-ddns" : {}, diff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre index 6f87293b86..5f77a32662 100644 --- a/src/bin/keactrl/kea-dhcp4.conf.pre +++ b/src/bin/keactrl/kea-dhcp4.conf.pre @@ -49,7 +49,7 @@ // more. For detailed description, see Sections 8.8, 16 and 15. "control-socket": { "socket-type": "unix", - "socket-name": "/tmp/kea-dhcp4-ctrl.sock" + "socket-name": "/tmp/kea4-ctrl-socket" }, // Use Memfile lease database backend to store leases in a CSV file. diff --git a/src/bin/keactrl/kea-dhcp6.conf.pre b/src/bin/keactrl/kea-dhcp6.conf.pre index 2e4d8ffe44..ffa75fc5a9 100644 --- a/src/bin/keactrl/kea-dhcp6.conf.pre +++ b/src/bin/keactrl/kea-dhcp6.conf.pre @@ -43,7 +43,7 @@ // description, see Sections 9.12, 16 and 15. "control-socket": { "socket-type": "unix", - "socket-name": "/tmp/kea-dhcp6-ctrl.sock" + "socket-name": "/tmp/kea6-ctrl-socket" }, // Use Memfile lease database backend to store leases in a CSV file. diff --git a/src/bin/keactrl/kea-netconf.conf.pre b/src/bin/keactrl/kea-netconf.conf.pre index f12717c8cb..6eeacecd86 100644 --- a/src/bin/keactrl/kea-netconf.conf.pre +++ b/src/bin/keactrl/kea-netconf.conf.pre @@ -30,13 +30,13 @@ "dhcp4": { "control-socket": { "socket-type": "unix", - "socket-name": "/tmp/kea-dhcp4-ctrl.sock" + "socket-name": "/tmp/kea4-ctrl-socket" } }, "dhcp6": { "control-socket": { "socket-type": "unix", - "socket-name": "/tmp/kea-dhcp6-ctrl.sock" + "socket-name": "/tmp/kea6-ctrl-socket" } } },