Added leases file to configuration parameters

diff --git a/README.md b/README.md
index 4a81e737ca932ac62868a9d9da64f7a5779625df..767f67ba6d7183b2395f90d20a5a2d0fcfd7cd41 100644 (file)
--- 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 8bddf086e9bbc4de1c6c75eb597d9af7512bcfaa..9bb6da2aa6cb3c24be8c35512aefbfc3b6060a95 100644 (file)
--- 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 c964b2f6ada2dafcca5cd7c47904cb7e5eda40dd..62e2fd4658059b55983399e603aa17a46e10b00b 100644 (file)
--- 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