mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-05-09 23:36:36 +02:00
116 lines
4.6 KiB
Diff
116 lines
4.6 KiB
Diff
* 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-}
|