Merge pull request #4743 from sarthurdev/kea3.0

kea: T7281: Fix Kea 3.0 service failures

8 files changed, 33 insertions, 21 deletions

diff --git a/src/etc/systemd/system/isc-kea-dhcp-ddns-server.service.d/override.conf b/src/etc/systemd/system/isc-kea-dhcp-ddns-server.service.d/override.conf
new file mode 100644
index 000000000..0afaacd71
--- /dev/null
+++ b/src/etc/systemd/system/isc-kea-dhcp-ddns-server.service.d/override.conf
@@ -0,0 +1,7 @@
+[Unit]
+After=
+After=vyos-router.service
+
+[Service]
+ExecStart=
+ExecStart=/usr/sbin/kea-dhcp-ddns -c /var/run/kea/kea-dhcp-ddns.conf
diff --git a/src/etc/systemd/system/kea-dhcp-ddns@.service b/src/etc/systemd/system/isc-kea-dhcp-ddns-server@.service
index b6360e573..9451addd4 100644
--- a/src/etc/systemd/system/kea-dhcp-ddns@.service
+++ b/src/etc/systemd/system/isc-kea-dhcp-ddns-server@.service
@@ -14,8 +14,8 @@ RuntimeDirectoryPreserve=yes
 LogsDirectory=kea
 LogsDirectoryMode=0750
 StateDirectory=kea
-ExecStart=sudo /bin/ip vrf exec %i /usr/sbin/kea-dhcp-ddns -c /run/kea/kea-%i-dhcp-ddns.conf
-ExecStartPost=/bin/sh -c 'sleep 10 && sudo /usr/bin/chown _kea:_kea /run/kea/kea-%i-dhcp-ddns* && sudo /usr/bin/chown _kea:_kea /run/kea/logger_lockfile'
+ExecStart=sudo /bin/ip vrf exec %i /usr/sbin/kea-dhcp-ddns -c /var/run/kea/kea-%i-dhcp-ddns.conf
+ExecStartPost=/bin/sh -c 'sleep 10 && sudo /usr/bin/chown _kea:_kea /var/run/kea/kea-%i-dhcp-ddns* && sudo /usr/bin/chown _kea:_kea /run/kea/logger_lockfile'
 Restart=on-failure
 
 [Install]
diff --git a/src/etc/systemd/system/kea-dhcp4.service.d/override.conf b/src/etc/systemd/system/isc-kea-dhcp4-server.service.d/override.conf
index 4a04892c0..f315e197b 100644
--- a/src/etc/systemd/system/kea-dhcp4.service.d/override.conf
+++ b/src/etc/systemd/system/isc-kea-dhcp4-server.service.d/override.conf
@@ -3,7 +3,9 @@ After=
 After=vyos-router.service
 
 [Service]
+Environment="KEA_DHCP_DATA_DIR=/config/dhcp"
+Environment="KEA_HOOK_SCRIPTS_PATH=/usr/libexec/vyos/system"
 ExecStart=
-ExecStart=/usr/sbin/kea-dhcp4 -c /run/kea/kea-dhcp4.conf
+ExecStart=/usr/sbin/kea-dhcp4 -c /var/run/kea/kea-dhcp4.conf
 ExecStartPost=!/usr/bin/python3 /usr/libexec/vyos/system/sync-dhcp-lease-to-hosts.py --inet
 Restart=on-failure
diff --git a/src/etc/systemd/system/kea-dhcp4@.service b/src/etc/systemd/system/isc-kea-dhcp4-server@.service
index f63364275..588cca216 100644
--- a/src/etc/systemd/system/kea-dhcp4@.service
+++ b/src/etc/systemd/system/isc-kea-dhcp4-server@.service
@@ -7,15 +7,19 @@ After=vyos-router.service
 [Service]
 User=_kea
 AmbientCapabilities=CAP_NET_BIND_SERVICE CAP_NET_RAW
+Environment="KEA_DHCP_DATA_DIR=/config/dhcp"
+Environment="KEA_HOOK_SCRIPTS_PATH=/usr/libexec/vyos/system"
 Environment="KEA_LOCKFILE_DIR=/run/lock/kea"
 ConfigurationDirectory=kea
+ConfigurationDirectoryMode=0750
 RuntimeDirectory=kea lock/kea
 RuntimeDirectoryPreserve=yes
+RuntimeDirectoryMode=0750
 LogsDirectory=kea
 LogsDirectoryMode=0750
 StateDirectory=kea
-ExecStart=sudo /bin/ip vrf exec %i /usr/sbin/kea-dhcp4 -c /run/kea/kea-%i-dhcp4.conf
-ExecStartPost=/bin/sh -c 'sleep 10 && sudo /usr/bin/chown _kea:_kea /run/kea/dhcp4-%i-ctrl* && sudo /usr/bin/chown _kea:_kea /run/kea/kea-%i-dhcp4* && sudo /usr/bin/chown _kea:_kea /run/kea/logger_lockfile'
+ExecStart=sudo -E /bin/ip vrf exec %i /usr/sbin/kea-dhcp4 -c /var/run/kea/kea-%i-dhcp4.conf
+ExecStartPost=/bin/sh -c 'sleep 10 && sudo /usr/bin/chown _kea:_kea /var/run/kea/dhcp4-%i-ctrl* && sudo /usr/bin/chown _kea:_kea /var/run/kea/kea-%i-dhcp4* && sudo /usr/bin/chown _kea:_kea /run/kea/logger_lockfile'
 Restart=on-failure
 
 [Install]
diff --git a/src/etc/systemd/system/isc-kea-dhcp6-server.service.d/override.conf b/src/etc/systemd/system/isc-kea-dhcp6-server.service.d/override.conf
new file mode 100644
index 000000000..cc1885877
--- /dev/null
+++ b/src/etc/systemd/system/isc-kea-dhcp6-server.service.d/override.conf
@@ -0,0 +1,9 @@
+[Unit]
+After=
+After=vyos-router.service
+
+[Service]
+Environment="KEA_DHCP_DATA_DIR=/config/dhcp"
+Environment="KEA_HOOK_SCRIPTS_PATH=/usr/libexec/vyos/system"
+ExecStart=
+ExecStart=/usr/sbin/kea-dhcp6 -c /var/run/kea/kea-dhcp6.conf
diff --git a/src/etc/systemd/system/kea-dhcp6@.service b/src/etc/systemd/system/isc-kea-dhcp6-server@.service
index 1d2330f74..7196239af 100644
--- a/src/etc/systemd/system/kea-dhcp6@.service
+++ b/src/etc/systemd/system/isc-kea-dhcp6-server@.service
@@ -7,15 +7,19 @@ After=vyos-router.service
 [Service]
 User=_kea
 AmbientCapabilities=CAP_NET_BIND_SERVICE
+Environment="KEA_DHCP_DATA_DIR=/config/dhcp"
+Environment="KEA_HOOK_SCRIPTS_PATH=/usr/libexec/vyos/system"
 Environment="KEA_LOCKFILE_DIR=/run/lock/kea"
 ConfigurationDirectory=kea
+ConfigurationDirectoryMode=0750
 RuntimeDirectory=kea lock/kea
 RuntimeDirectoryPreserve=yes
+RuntimeDirectoryMode=0750
 LogsDirectory=kea
 LogsDirectoryMode=0750
 StateDirectory=kea
-ExecStart=sudo /bin/ip vrf exec %i /usr/sbin/kea-dhcp6 -c /run/kea/kea-%i-dhcp6.conf
-ExecStartPost=/bin/sh -c 'sleep 10 && sudo /usr/bin/chown _kea:_kea /run/kea/dhcp6-%i-ctrl* && sudo /usr/bin/chown _kea:_kea /run/kea/kea-%i-dhcp6* && sudo /usr/bin/chown _kea:_kea /run/kea/logger_lockfile'
+ExecStart=sudo -E /bin/ip vrf exec %i /usr/sbin/kea-dhcp6 -c /var/run/kea/kea-%i-dhcp6.conf
+ExecStartPost=/bin/sh -c 'sleep 10 && sudo /usr/bin/chown _kea:_kea /var/run/kea/dhcp6-%i-ctrl* && sudo /usr/bin/chown _kea:_kea /var/run/kea/kea-%i-dhcp6* && sudo /usr/bin/chown _kea:_kea /run/kea/logger_lockfile'
 Restart=on-failure
 
 [Install]
diff --git a/src/etc/systemd/system/kea-dhcp-ddns.service.d/override.conf b/src/etc/systemd/system/kea-dhcp-ddns.service.d/override.conf
deleted file mode 100644
index cdfdea8eb..000000000
--- a/src/etc/systemd/system/kea-dhcp-ddns.service.d/override.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-After=
-After=vyos-router.service
-
-[Service]
-ExecStart=
-ExecStart=/usr/sbin/kea-dhcp-ddns -c /run/kea/kea-dhcp-ddns.conf
diff --git a/src/etc/systemd/system/kea-dhcp6.service.d/override.conf b/src/etc/systemd/system/kea-dhcp6.service.d/override.conf
deleted file mode 100644
index cb33fc057..000000000
--- a/src/etc/systemd/system/kea-dhcp6.service.d/override.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-After=
-After=vyos-router.service
-
-[Service]
-ExecStart=
-ExecStart=/usr/sbin/kea-dhcp6 -c /run/kea/kea-dhcp6.conf