Commit 72c3987d authored by Wlodzimierz Wencel's avatar Wlodzimierz Wencel Committed by Tomek Mrugalski

[#795] sockets paths unified between examples and default configs

parent fb1ec54c
......@@ -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"
}
},
......
......@@ -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 }
}
},
......
......@@ -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":
......
......@@ -36,7 +36,7 @@
"control-socket":
{
"socket-type": "unix",
"socket-name": "/tmp/d2-ctrl-socket"
"socket-name": "/tmp/kea-ddns-ctrl-socket"
},
//
......
......@@ -25,7 +25,7 @@
// "control-socket":
// {
// "socket-type": "unix",
// "socket-name": "/tmp/d2-ctrl-socket"
// "socket-name": "/tmp/kea-ddns-ctrl-socket"
// },
//
......
......@@ -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.
......
......@@ -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.
......
......@@ -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.
......
......@@ -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.
......
......@@ -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.
......
......@@ -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.
......
......@@ -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.
......
......@@ -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.
......
......@@ -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"
}
}
},
......
......@@ -12,7 +12,7 @@
<interfaces>eth1</interfaces>
</interfaces-config>
<control-socket>
<socket-name>/tmp/kea6-sock</socket-name>
<socket-name>/tmp/kea6-ctrl-socket</socket-name>
<socket-type>unix</socket-type>
</control-socket>
</config>
......@@ -12,7 +12,7 @@
<interfaces>eth1</interfaces>
</interfaces-config>
<control-socket>
<socket-name>/tmp/kea6-sock</socket-name>
<socket-name>/tmp/kea6-ctrl-socket</socket-name>
<socket-type>unix</socket-type>
</control-socket>
</config>
......@@ -12,7 +12,7 @@
<interfaces>eth1</interfaces>
</interfaces-config>
<control-socket>
<socket-name>/tmp/kea6-sock</socket-name>
<socket-name>/tmp/kea6-ctrl-socket</socket-name>
<socket-type>unix</socket-type>
</control-socket>
<user-context>bad</user-context>
......
......@@ -2,7 +2,7 @@
"Dhcp6": {
"control-socket": {
"socket-type": "unix",
"socket-name": "/tmp/kea6-sock"
"socket-name": "/tmp/kea6-ctrl-socket"
}
}
}
......@@ -12,7 +12,7 @@
<subnet>2001:db8::/64</subnet>
</subnet6>
<control-socket>
<socket-name>/tmp/kea6-sock</socket-name>
<socket-name>/tmp/kea6-ctrl-socket</socket-name>
<socket-type>unix</socket-type>
</control-socket>
<logger>
......
......@@ -8,7 +8,7 @@
"control-socket":
{
"socket-type": "unix",
"socket-name": "/tmp/kea6-sock"
"socket-name": "/tmp/kea6-ctrl-socket"
}
}
},
......
......@@ -12,7 +12,7 @@
<interfaces>eth1</interfaces>
</interfaces-config>
<control-socket>
<socket-name>/tmp/kea6-sock</socket-name>
<socket-name>/tmp/kea6-ctrl-socket</socket-name>
<socket-type>unix</socket-type>
</control-socket>
</config>
......@@ -17,7 +17,7 @@
<interfaces>eth1</interfaces>
</interfaces-config>
<control-socket>
<socket-name>/tmp/kea6-sock</socket-name>
<socket-name>/tmp/kea6-ctrl-socket</socket-name>
<socket-type>unix</socket-type>
</control-socket>
</config>
......@@ -21,7 +21,7 @@
<interfaces>eth1</interfaces>
</interfaces-config>
<control-socket>
<socket-name>/tmp/kea6-sock</socket-name>
<socket-name>/tmp/kea6-ctrl-socket</socket-name>
<socket-type>unix</socket-type>
</control-socket>
</config>
......@@ -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"
}
},
......
......@@ -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" : {},
......
......@@ -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.
......
......@@ -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.
......
......@@ -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"
}
}
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment