From f2f2d3c0f0c8f6772f4f24b4bd7203837c1afed9 Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Mon, 22 Sep 2025 22:29:45 +0200
Subject: kea: T7281: Use correct Kea unit files

---
 .../override.conf                                  |  7 +++++++
 .../system/isc-kea-dhcp-ddns-server@.service       | 22 ++++++++++++++++++++++
 .../isc-kea-dhcp4-server.service.d/override.conf   |  9 +++++++++
 .../systemd/system/isc-kea-dhcp4-server@.service   | 22 ++++++++++++++++++++++
 .../isc-kea-dhcp6-server.service.d/override.conf   |  7 +++++++
 .../systemd/system/isc-kea-dhcp6-server@.service   | 22 ++++++++++++++++++++++
 .../system/kea-dhcp-ddns.service.d/override.conf   |  7 -------
 src/etc/systemd/system/kea-dhcp-ddns@.service      | 22 ----------------------
 .../system/kea-dhcp4.service.d/override.conf       |  9 ---------
 src/etc/systemd/system/kea-dhcp4@.service          | 22 ----------------------
 .../system/kea-dhcp6.service.d/override.conf       |  7 -------
 src/etc/systemd/system/kea-dhcp6@.service          | 22 ----------------------
 12 files changed, 89 insertions(+), 89 deletions(-)
 create mode 100644 src/etc/systemd/system/isc-kea-dhcp-ddns-server.service.d/override.conf
 create mode 100644 src/etc/systemd/system/isc-kea-dhcp-ddns-server@.service
 create mode 100644 src/etc/systemd/system/isc-kea-dhcp4-server.service.d/override.conf
 create mode 100644 src/etc/systemd/system/isc-kea-dhcp4-server@.service
 create mode 100644 src/etc/systemd/system/isc-kea-dhcp6-server.service.d/override.conf
 create mode 100644 src/etc/systemd/system/isc-kea-dhcp6-server@.service
 delete mode 100644 src/etc/systemd/system/kea-dhcp-ddns.service.d/override.conf
 delete mode 100644 src/etc/systemd/system/kea-dhcp-ddns@.service
 delete mode 100644 src/etc/systemd/system/kea-dhcp4.service.d/override.conf
 delete mode 100644 src/etc/systemd/system/kea-dhcp4@.service
 delete mode 100644 src/etc/systemd/system/kea-dhcp6.service.d/override.conf
 delete mode 100644 src/etc/systemd/system/kea-dhcp6@.service

(limited to 'src/etc/systemd/system')

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..cdfdea8eb
--- /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 /run/kea/kea-dhcp-ddns.conf
diff --git a/src/etc/systemd/system/isc-kea-dhcp-ddns-server@.service b/src/etc/systemd/system/isc-kea-dhcp-ddns-server@.service
new file mode 100644
index 000000000..b6360e573
--- /dev/null
+++ b/src/etc/systemd/system/isc-kea-dhcp-ddns-server@.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=Kea DDNS Service
+Documentation=man:kea-dhcp-ddns(8)
+Wants=network-online.target
+After=vyos-router.service
+
+[Service]
+User=_kea
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+Environment="KEA_LOCKFILE_DIR=/run/lock/kea"
+ConfigurationDirectory=kea
+RuntimeDirectory=kea lock/kea
+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'
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/src/etc/systemd/system/isc-kea-dhcp4-server.service.d/override.conf b/src/etc/systemd/system/isc-kea-dhcp4-server.service.d/override.conf
new file mode 100644
index 000000000..4a04892c0
--- /dev/null
+++ b/src/etc/systemd/system/isc-kea-dhcp4-server.service.d/override.conf
@@ -0,0 +1,9 @@
+[Unit]
+After=
+After=vyos-router.service
+
+[Service]
+ExecStart=
+ExecStart=/usr/sbin/kea-dhcp4 -c /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/isc-kea-dhcp4-server@.service b/src/etc/systemd/system/isc-kea-dhcp4-server@.service
new file mode 100644
index 000000000..f63364275
--- /dev/null
+++ b/src/etc/systemd/system/isc-kea-dhcp4-server@.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=Kea IPv4 DHCP daemon
+Documentation=man:kea-dhcp4(8)
+Wants=network-online.target
+After=vyos-router.service
+
+[Service]
+User=_kea
+AmbientCapabilities=CAP_NET_BIND_SERVICE CAP_NET_RAW
+Environment="KEA_LOCKFILE_DIR=/run/lock/kea"
+ConfigurationDirectory=kea
+RuntimeDirectory=kea lock/kea
+RuntimeDirectoryPreserve=yes
+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'
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
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..cb33fc057
--- /dev/null
+++ b/src/etc/systemd/system/isc-kea-dhcp6-server.service.d/override.conf
@@ -0,0 +1,7 @@
+[Unit]
+After=
+After=vyos-router.service
+
+[Service]
+ExecStart=
+ExecStart=/usr/sbin/kea-dhcp6 -c /run/kea/kea-dhcp6.conf
diff --git a/src/etc/systemd/system/isc-kea-dhcp6-server@.service b/src/etc/systemd/system/isc-kea-dhcp6-server@.service
new file mode 100644
index 000000000..1d2330f74
--- /dev/null
+++ b/src/etc/systemd/system/isc-kea-dhcp6-server@.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=Kea IPv6 DHCP daemon
+Documentation=man:kea-dhcp6(8)
+Wants=network-online.target
+After=vyos-router.service
+
+[Service]
+User=_kea
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+Environment="KEA_LOCKFILE_DIR=/run/lock/kea"
+ConfigurationDirectory=kea
+RuntimeDirectory=kea lock/kea
+RuntimeDirectoryPreserve=yes
+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'
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
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-dhcp-ddns@.service b/src/etc/systemd/system/kea-dhcp-ddns@.service
deleted file mode 100644
index b6360e573..000000000
--- a/src/etc/systemd/system/kea-dhcp-ddns@.service
+++ /dev/null
@@ -1,22 +0,0 @@
-[Unit]
-Description=Kea DDNS Service
-Documentation=man:kea-dhcp-ddns(8)
-Wants=network-online.target
-After=vyos-router.service
-
-[Service]
-User=_kea
-AmbientCapabilities=CAP_NET_BIND_SERVICE
-Environment="KEA_LOCKFILE_DIR=/run/lock/kea"
-ConfigurationDirectory=kea
-RuntimeDirectory=kea lock/kea
-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'
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/src/etc/systemd/system/kea-dhcp4.service.d/override.conf b/src/etc/systemd/system/kea-dhcp4.service.d/override.conf
deleted file mode 100644
index 4a04892c0..000000000
--- a/src/etc/systemd/system/kea-dhcp4.service.d/override.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-After=
-After=vyos-router.service
-
-[Service]
-ExecStart=
-ExecStart=/usr/sbin/kea-dhcp4 -c /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/kea-dhcp4@.service
deleted file mode 100644
index f63364275..000000000
--- a/src/etc/systemd/system/kea-dhcp4@.service
+++ /dev/null
@@ -1,22 +0,0 @@
-[Unit]
-Description=Kea IPv4 DHCP daemon
-Documentation=man:kea-dhcp4(8)
-Wants=network-online.target
-After=vyos-router.service
-
-[Service]
-User=_kea
-AmbientCapabilities=CAP_NET_BIND_SERVICE CAP_NET_RAW
-Environment="KEA_LOCKFILE_DIR=/run/lock/kea"
-ConfigurationDirectory=kea
-RuntimeDirectory=kea lock/kea
-RuntimeDirectoryPreserve=yes
-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'
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
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
diff --git a/src/etc/systemd/system/kea-dhcp6@.service b/src/etc/systemd/system/kea-dhcp6@.service
deleted file mode 100644
index 1d2330f74..000000000
--- a/src/etc/systemd/system/kea-dhcp6@.service
+++ /dev/null
@@ -1,22 +0,0 @@
-[Unit]
-Description=Kea IPv6 DHCP daemon
-Documentation=man:kea-dhcp6(8)
-Wants=network-online.target
-After=vyos-router.service
-
-[Service]
-User=_kea
-AmbientCapabilities=CAP_NET_BIND_SERVICE
-Environment="KEA_LOCKFILE_DIR=/run/lock/kea"
-ConfigurationDirectory=kea
-RuntimeDirectory=kea lock/kea
-RuntimeDirectoryPreserve=yes
-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'
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-- 
cgit v1.2.3