Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Kea
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
445
Issues
445
List
Boards
Labels
Service Desk
Milestones
Merge Requests
71
Merge Requests
71
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
ISC Open Source Projects
Kea
Commits
72c3987d
Commit
72c3987d
authored
Sep 09, 2019
by
Wlodzimierz Wencel
Committed by
Tomek Mrugalski
Oct 25, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[
#795
] sockets paths unified between examples and default configs
parent
fb1ec54c
Changes
28
Hide whitespace changes
Inline
Side-by-side
Showing
28 changed files
with
33 additions
and
33 deletions
+33
-33
doc/examples/agent/comments.json
doc/examples/agent/comments.json
+1
-1
doc/examples/agent/simple.json
doc/examples/agent/simple.json
+3
-3
doc/examples/ddns/comments.json
doc/examples/ddns/comments.json
+1
-1
doc/examples/ddns/sample1.json
doc/examples/ddns/sample1.json
+1
-1
doc/examples/ddns/template.json
doc/examples/ddns/template.json
+1
-1
doc/examples/kea4/all-keys-netconf.json
doc/examples/kea4/all-keys-netconf.json
+1
-1
doc/examples/kea4/all-keys.json
doc/examples/kea4/all-keys.json
+1
-1
doc/examples/kea4/config-backend.json
doc/examples/kea4/config-backend.json
+1
-1
doc/examples/kea4/ha-load-balancing-primary.json
doc/examples/kea4/ha-load-balancing-primary.json
+1
-1
doc/examples/kea6/all-keys-netconf.json
doc/examples/kea6/all-keys-netconf.json
+1
-1
doc/examples/kea6/all-keys.json
doc/examples/kea6/all-keys.json
+1
-1
doc/examples/kea6/config-backend.json
doc/examples/kea6/config-backend.json
+1
-1
doc/examples/kea6/ha-hot-standby.json
doc/examples/kea6/ha-hot-standby.json
+1
-1
doc/examples/netconf/comments.json
doc/examples/netconf/comments.json
+1
-1
doc/examples/netconf/kea-dhcp6-operations/BAD-config.xml
doc/examples/netconf/kea-dhcp6-operations/BAD-config.xml
+1
-1
doc/examples/netconf/kea-dhcp6-operations/BAD-schema.xml
doc/examples/netconf/kea-dhcp6-operations/BAD-schema.xml
+1
-1
doc/examples/netconf/kea-dhcp6-operations/BAD-translator.xml
doc/examples/netconf/kea-dhcp6-operations/BAD-translator.xml
+1
-1
doc/examples/netconf/kea-dhcp6-operations/boot.json
doc/examples/netconf/kea-dhcp6-operations/boot.json
+1
-1
doc/examples/netconf/kea-dhcp6-operations/logging.xml
doc/examples/netconf/kea-dhcp6-operations/logging.xml
+1
-1
doc/examples/netconf/kea-dhcp6-operations/netconf.json
doc/examples/netconf/kea-dhcp6-operations/netconf.json
+1
-1
doc/examples/netconf/kea-dhcp6-operations/startup.xml
doc/examples/netconf/kea-dhcp6-operations/startup.xml
+1
-1
doc/examples/netconf/kea-dhcp6-operations/twopools.xml
doc/examples/netconf/kea-dhcp6-operations/twopools.xml
+1
-1
doc/examples/netconf/kea-dhcp6-operations/twosubnets.xml
doc/examples/netconf/kea-dhcp6-operations/twosubnets.xml
+1
-1
src/bin/keactrl/kea-ctrl-agent.conf.pre
src/bin/keactrl/kea-ctrl-agent.conf.pre
+3
-3
src/bin/keactrl/kea-dhcp-ddns.conf.pre
src/bin/keactrl/kea-dhcp-ddns.conf.pre
+1
-1
src/bin/keactrl/kea-dhcp4.conf.pre
src/bin/keactrl/kea-dhcp4.conf.pre
+1
-1
src/bin/keactrl/kea-dhcp6.conf.pre
src/bin/keactrl/kea-dhcp6.conf.pre
+1
-1
src/bin/keactrl/kea-netconf.conf.pre
src/bin/keactrl/kea-netconf.conf.pre
+2
-2
No files found.
doc/examples/agent/comments.json
View file @
72c3987d
...
...
@@ -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
"
}
},
...
...
doc/examples/agent/simple.json
View file @
72c3987d
...
...
@@ -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
DHCPv
6
command
channel
socket.
"dhcp6"
:
{
"socket-type"
:
"unix"
,
"socket-name"
:
"/
path/to/the/unix/socket-v6
"
"socket-name"
:
"/
tmp/kea6-ctrl-socket
"
},
//
Location
of
the
D
2
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
}
}
},
...
...
doc/examples/ddns/comments.json
View file @
72c3987d
...
...
@@ -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"
:
...
...
doc/examples/ddns/sample1.json
View file @
72c3987d
...
...
@@ -36,7 +36,7 @@
"control-socket"
:
{
"socket-type"
:
"unix"
,
"socket-name"
:
"/tmp/
d2
-ctrl-socket"
"socket-name"
:
"/tmp/
kea-ddns
-ctrl-socket"
},
//
...
...
doc/examples/ddns/template.json
View file @
72c3987d
...
...
@@ -25,7 +25,7 @@
//
"control-socket"
:
//
{
//
"socket-type"
:
"unix"
,
//
"socket-name"
:
"/tmp/
d2
-ctrl-socket"
//
"socket-name"
:
"/tmp/
kea-ddns
-ctrl-socket"
//
},
//
...
...
doc/examples/kea4/all-keys-netconf.json
View file @
72c3987d
...
...
@@ -91,7 +91,7 @@
//
Location
of
the
unix
domain
socket
file
the
DHCPv
4
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/kea
4-ctrl-socket
"
,
//
Control
socket
type
used
by
the
Kea
DHCPv
4
server.
The
'unix'
//
socket
is
currently
the
only
supported
type.
...
...
doc/examples/kea4/all-keys.json
View file @
72c3987d
...
...
@@ -91,7 +91,7 @@
//
Location
of
the
unix
domain
socket
file
the
DHCPv
4
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/kea
4-ctrl-socket
"
,
//
Control
socket
type
used
by
the
Kea
DHCPv
4
server.
The
'unix'
//
socket
is
currently
the
only
supported
type.
...
...
doc/examples/kea4/config-backend.json
View file @
72c3987d
...
...
@@ -50,7 +50,7 @@
//
details.
"control-socket"
:
{
"socket-type"
:
"unix"
,
"socket-name"
:
"/tmp/kea
-dhcp4.sock
"
"socket-name"
:
"/tmp/kea
4-ctrl-socket
"
},
//
Hooks
libraries
that
enable
configuration
backend
are
loaded.
...
...
doc/examples/kea4/ha-load-balancing-primary.json
View file @
72c3987d
...
...
@@ -23,7 +23,7 @@
//
API
between
the
HA
peers.
"control-socket"
:
{
"socket-type"
:
"unix"
,
"socket-name"
:
"/tmp/kea
-dhcp4-ctrl.sock
"
"socket-name"
:
"/tmp/kea
4-ctrl-socket
"
},
//
Use
Memfile
lease
database
backend
to
store
leases
in
a
CSV
file.
...
...
doc/examples/kea6/all-keys-netconf.json
View file @
72c3987d
...
...
@@ -56,7 +56,7 @@
//
Location
of
the
unix
domain
socket
file
the
DHCPv
6
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/kea
6-ctrl-socket
"
,
//
Control
socket
type
used
by
the
Kea
DHCPv
6
server.
The
'unix'
//
socket
is
currently
the
only
supported
type.
...
...
doc/examples/kea6/all-keys.json
View file @
72c3987d
...
...
@@ -56,7 +56,7 @@
//
Location
of
the
unix
domain
socket
file
the
DHCPv
6
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/kea
6-ctrl-socket
"
,
//
Control
socket
type
used
by
the
Kea
DHCPv
6
server.
The
'unix'
//
socket
is
currently
the
only
supported
type.
...
...
doc/examples/kea6/config-backend.json
View file @
72c3987d
...
...
@@ -50,7 +50,7 @@
//
details.
"control-socket"
:
{
"socket-type"
:
"unix"
,
"socket-name"
:
"/tmp/kea
-dhcp6.sock
"
"socket-name"
:
"/tmp/kea
6-ctrl-socket
"
},
//
Hooks
libraries
that
enable
configuration
backend
are
loaded.
...
...
doc/examples/kea6/ha-hot-standby.json
View file @
72c3987d
...
...
@@ -21,7 +21,7 @@
//
API
between
the
HA
peers.
"control-socket"
:
{
"socket-type"
:
"unix"
,
"socket-name"
:
"/tmp/kea
-dhcp6-ctrl.sock
"
"socket-name"
:
"/tmp/kea
6-ctrl-socket
"
},
//
Use
Memfile
lease
database
backend
to
store
leases
in
a
CSV
file.
...
...
doc/examples/netconf/comments.json
View file @
72c3987d
...
...
@@ -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
"
}
}
},
...
...
doc/examples/netconf/kea-dhcp6-operations/BAD-config.xml
View file @
72c3987d
...
...
@@ -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>
doc/examples/netconf/kea-dhcp6-operations/BAD-schema.xml
View file @
72c3987d
...
...
@@ -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>
doc/examples/netconf/kea-dhcp6-operations/BAD-translator.xml
View file @
72c3987d
...
...
@@ -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>
...
...
doc/examples/netconf/kea-dhcp6-operations/boot.json
View file @
72c3987d
...
...
@@ -2,7 +2,7 @@
"Dhcp6"
:
{
"control-socket"
:
{
"socket-type"
:
"unix"
,
"socket-name"
:
"/tmp/kea6-
sock
"
"socket-name"
:
"/tmp/kea6-
ctrl-socket
"
}
}
}
doc/examples/netconf/kea-dhcp6-operations/logging.xml
View file @
72c3987d
...
...
@@ -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>
...
...
doc/examples/netconf/kea-dhcp6-operations/netconf.json
View file @
72c3987d
...
...
@@ -8,7 +8,7 @@
"control-socket"
:
{
"socket-type"
:
"unix"
,
"socket-name"
:
"/tmp/kea6-
sock
"
"socket-name"
:
"/tmp/kea6-
ctrl-socket
"
}
}
},
...
...
doc/examples/netconf/kea-dhcp6-operations/startup.xml
View file @
72c3987d
...
...
@@ -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>
doc/examples/netconf/kea-dhcp6-operations/twopools.xml
View file @
72c3987d
...
...
@@ -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>
doc/examples/netconf/kea-dhcp6-operations/twosubnets.xml
View file @
72c3987d
...
...
@@ -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>
src/bin/keactrl/kea-ctrl-agent.conf.pre
View file @
72c3987d
...
...
@@ -26,15 +26,15 @@
"control-sockets": {
"dhcp4": {
"socket-type": "unix",
"socket-name": "/tmp/kea
-dhcp4-ctrl.sock
"
"socket-name": "/tmp/kea
4-ctrl-socket
"
},
"dhcp6": {
"socket-type": "unix",
"socket-name": "/tmp/kea
-dhcp6-ctrl.sock
"
"socket-name": "/tmp/kea
6-ctrl-socket
"
},
"d2": {
"socket-type": "unix",
"socket-name": "/tmp/kea-d
hcp-ddns-ctrl.sock
"
"socket-name": "/tmp/kea-d
dns-ctrl-socket
"
}
},
...
...
src/bin/keactrl/kea-dhcp-ddns.conf.pre
View file @
72c3987d
...
...
@@ -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" : {},
...
...
src/bin/keactrl/kea-dhcp4.conf.pre
View file @
72c3987d
...
...
@@ -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/kea
4-ctrl-socket
"
},
// Use Memfile lease database backend to store leases in a CSV file.
...
...
src/bin/keactrl/kea-dhcp6.conf.pre
View file @
72c3987d
...
...
@@ -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/kea
6-ctrl-socket
"
},
// Use Memfile lease database backend to store leases in a CSV file.
...
...
src/bin/keactrl/kea-netconf.conf.pre
View file @
72c3987d
...
...
@@ -30,13 +30,13 @@
"dhcp4": {
"control-socket": {
"socket-type": "unix",
"socket-name": "/tmp/kea
-dhcp4-ctrl.sock
"
"socket-name": "/tmp/kea
4-ctrl-socket
"
}
},
"dhcp6": {
"control-socket": {
"socket-type": "unix",
"socket-name": "/tmp/kea
-dhcp6-ctrl.sock
"
"socket-name": "/tmp/kea
6-ctrl-socket
"
}
}
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment