From 398cfb6751b04584d80416f6e12b67d3fc91039f Mon Sep 17 00:00:00 2001 From: Giorgio Ravera Date: Tue, 3 Feb 2026 17:40:34 +0100 Subject: [PATCH] Added leases file to configuration parameters --- README.md | 2 ++ settings/default.py | 2 ++ settings/settings.py | 8 ++++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4a81e73..767f67b 100644 --- a/README.md +++ b/README.md @@ -149,7 +149,9 @@ secrets: | `DNS_REVERSE_FILE` | reverse/hosts.inc | BIND9 Reverse Hosts file | | `DHCP_CFG_PATH` | /dns/etc | KEA Configuration folder | | `DHCP4_HOST_FILE` | hosts-ipv4.json | KEA-DHCP4 Hosts file | +| `DHCP4_LEASES_FILE` | dhcp4.leases | KEA-DHCP4 leases file | | `DHCP6_HOST_FILE` | hosts-ipv6.json | KEA-DHCP6 Hosts file | +| `DHCP6_LEASES_FILE` | dhcp6.leases | KEA-DHCP6 leases file | --- diff --git a/settings/default.py b/settings/default.py index 8bddf08..9bb6da2 100644 --- a/settings/default.py +++ b/settings/default.py @@ -57,4 +57,6 @@ DNS_REVERSE_FILE="reverse/hosts.inc" # --------------------------------------------------------- DHCP_CFG_PATH="/dhcp/etc" DHCP4_HOST_FILE="hosts-ipv4.json" +DHCP4_LEASES_FILE="dhcp4.leases" DHCP6_HOST_FILE="hosts-ipv6.json" +DHCP6_LEASES_FILE="dhcp6.leases" diff --git a/settings/settings.py b/settings/settings.py index c964b2f..62e2fd4 100644 --- a/settings/settings.py +++ b/settings/settings.py @@ -95,7 +95,9 @@ class Settings(BaseModel): # DHCP DHCP_CFG_PATH: str = Field(default_factory=lambda: os.getenv("DHCP_CFG_PATH", default.DHCP_CFG_PATH)) DHCP4_HOST_FILE: str = Field(default_factory=lambda: os.getenv("DHCP4_HOST_FILE", default.DHCP4_HOST_FILE)) + DHCP4_LEASES_FILE: str = Field(default_factory=lambda: os.getenv("DHCP4_LEASES_FILE", default.DHCP4_LEASES_FILE)) DHCP6_HOST_FILE: str = Field(default_factory=lambda: os.getenv("DHCP6_HOST_FILE", default.DHCP6_HOST_FILE)) + DHCP6_LEASES_FILE: str = Field(default_factory=lambda: os.getenv("DHCP6_LEASES_FILE", default.DHCP6_LEASES_FILE)) def model_post_init(self, __context) -> None: if self.DEVEL: @@ -119,8 +121,10 @@ class Settings(BaseModel): self.DNS_REVERSE_FILE = self.DNS_CFG_PATH + "/" + self.DNS_REVERSE_FILE # Update DHCP Files - self.DHCP4_HOST_FILE = self.DHCP_CFG_PATH + "/" + self.DHCP4_HOST_FILE - self.DHCP6_HOST_FILE = self.DHCP_CFG_PATH + "/" + self.DHCP6_HOST_FILE + self.DHCP4_HOST_FILE = self.DHCP_CFG_PATH + "/" + self.DHCP4_HOST_FILE + self.DHCP4_LEASES_FILE = self.DHCP_CFG_PATH + "/" + self.DHCP4_LEASES_FILE + self.DHCP6_HOST_FILE = self.DHCP_CFG_PATH + "/" + self.DHCP6_HOST_FILE + self.DHCP6_LEASES_FILE = self.DHCP_CFG_PATH + "/" + self.DHCP6_LEASES_FILE # --------------------------------------------------------- # Singleton -- 2.47.3