1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
|
* We have to move logs from /var/log to /var/log/kea to allow running
under unprivileged user.
* /tmp is not a good location for control sockets, move them to /run/kea.
--- a/src/bin/keactrl/kea-ctrl-agent.conf.pre
+++ b/src/bin/keactrl/kea-ctrl-agent.conf.pre
@@ -32,15 +32,15 @@
"control-sockets": {
"dhcp4": {
"socket-type": "unix",
- "socket-name": "/tmp/kea4-ctrl-socket"
+ "socket-name": "/run/kea/kea-dhcp4-ctrl.sock"
},
"dhcp6": {
"socket-type": "unix",
- "socket-name": "/tmp/kea6-ctrl-socket"
+ "socket-name": "/run/kea/kea-dhcp6-ctrl.sock"
},
"d2": {
"socket-type": "unix",
- "socket-name": "/tmp/kea-ddns-ctrl-socket"
+ "socket-name": "/run/kea/kea-dhcp-ddns-ctrl.sock"
}
},
@@ -73,7 +73,7 @@
// - syslog (logs to syslog)
// - syslog:name (logs to syslog using specified name)
// Any other value is considered a name of the file
- "output": "@localstatedir@/log/kea-ctrl-agent.log"
+ "output": "@localstatedir@/log/kea/kea-ctrl-agent.log"
// Shorter log pattern suitable for use with systemd,
// avoids redundant information
--- 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-ddns-ctrl-socket"
+ "socket-name": "/run/kea/kea-dhcp-ddns-ctrl.sock"
},
"tsig-keys": [],
"forward-ddns" : {},
@@ -44,7 +44,7 @@
// - syslog (logs to syslog)
// - syslog:name (logs to syslog using specified name)
// Any other value is considered a name of the file
- "output": "@localstatedir@/log/kea-ddns.log"
+ "output": "@localstatedir@/log/kea/kea-ddns.log"
// Shorter log pattern suitable for use with systemd,
// avoids redundant information
--- 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/kea4-ctrl-socket"
+ "socket-name": "/run/kea/kea-dhcp4-ctrl.sock"
},
// Use Memfile lease database backend to store leases in a CSV file.
@@ -429,7 +429,7 @@
// - syslog (logs to syslog)
// - syslog:name (logs to syslog using specified name)
// Any other value is considered a name of the file
- "output": "@localstatedir@/log/kea-dhcp4.log"
+ "output": "@localstatedir@/log/kea/kea-dhcp4.log"
// Shorter log pattern suitable for use with systemd,
// avoids redundant information
--- 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/kea6-ctrl-socket"
+ "socket-name": "/run/kea/kea-dhcp6-ctrl.sock"
},
// Use Memfile lease database backend to store leases in a CSV file.
@@ -388,7 +388,7 @@
// - syslog (logs to syslog)
// - syslog:name (logs to syslog using specified name)
// Any other value is considered a name of the file
- "output": "@localstatedir@/log/kea-dhcp6.log"
+ "output": "@localstatedir@/log/kea/kea-dhcp6.log"
// Shorter log pattern suitable for use with systemd,
// avoids redundant information
--- a/src/bin/keactrl/kea-netconf.conf.pre
+++ b/src/bin/keactrl/kea-netconf.conf.pre
@@ -69,7 +69,7 @@
// - syslog (logs to syslog)
// - syslog:name (logs to syslog using specified name)
// Any other value is considered a name of a time
- "output": "@localstatedir@/log/kea-netconf.log"
+ "output": "@localstatedir@/log/kea/kea-netconf.log"
// Shorter log pattern suitable for use with systemd,
// avoids redundant information
--- a/src/bin/keactrl/keactrl.in
+++ b/src/bin/keactrl/keactrl.in
@@ -336,7 +336,7 @@
# to the default file.
if [ -z "${KEA_LOGGER_DESTINATION+x}" ]; then
prefix="@prefix@"
- export KEA_LOGGER_DESTINATION="@localstatedir@/log/kea.log"
+ export KEA_LOGGER_DESTINATION="@localstatedir@/log/kea/kea.log"
fi
command=${1-}
|
