diff options
| author | Ole Mathias Heggem <olemathias.aa.heggem@gmail.com> | 2025-03-28 14:07:36 +0100 |
|---|---|---|
| committer | Ole Mathias Heggem <olemathias.aa.heggem@gmail.com> | 2025-03-28 14:07:36 +0100 |
| commit | 93ee858b17d9a4c13d2525743546e85329e82f14 (patch) | |
| tree | 8755772f6af35c8a53be353bc6e7813291028d6b | |
| parent | 9dc4d7eedb7ddd89d1e95e3fd55ccffd30a3e0df (diff) | |
tg25 preptg23-dhcp
| -rw-r--r-- | tools/dhcpns/config/ddns.py | 7 | ||||
| -rw-r--r-- | tools/dhcpns/config/dhcp4.py | 13 | ||||
| -rw-r--r-- | tools/dhcpns/config/dhcp6.py | 2 | ||||
| -rw-r--r-- | tools/dhcpns/tests/__init__.py | 0 |
4 files changed, 9 insertions, 13 deletions
diff --git a/tools/dhcpns/config/ddns.py b/tools/dhcpns/config/ddns.py index 8490967..3dc20e7 100644 --- a/tools/dhcpns/config/ddns.py +++ b/tools/dhcpns/config/ddns.py @@ -26,8 +26,11 @@ def base(ddns_domains = [], ddns_reverse_domains = []): "name": "kea-dhcp-ddns", "output_options": [ { - "output": "stdout", - "pattern": "%-5p %m\n" + "output": "/var/log/kea/ddns-debug.log", + "maxver": 8, + "maxsize": 204800, + "flush": True, + "pattern": "%d{%j %H:%M:%S.%q} %c %m\n" } ], "severity": "INFO", diff --git a/tools/dhcpns/config/dhcp4.py b/tools/dhcpns/config/dhcp4.py index eeabe5e..bb5ae15 100644 --- a/tools/dhcpns/config/dhcp4.py +++ b/tools/dhcpns/config/dhcp4.py @@ -17,7 +17,7 @@ def base(subnet4): { "name": "config-file-name", "space": "vendor-encapsulated-options-space", - "supersede": "ifelse(option[82].option[1].exists,concat('api/templates/magic.conf/a=', option[82].option[1].hex),'')" + "supersede": "ifelse(option[82].option[1].exists,concat('ztp', option[82].option[1].hex),'')" } ] }, @@ -28,13 +28,6 @@ def base(subnet4): } ] } - }, - { - "library": "/usr/lib/x86_64-linux-gnu/kea/hooks/libdhcp_run_script.so", - "parameters": { - "name": "/etc/kea/gondul.sh", - "sync": False - } } ], "dhcp-ddns": { @@ -45,7 +38,7 @@ def base(subnet4): "ddns-override-no-update": False, "ddns-override-client-update": False, "ddns-replace-client-name": "always", - "ddns-generated-prefix": "dyn", + "ddns-generated-prefix": "dhcp", "ddns-update-on-renew": False, "ddns-use-conflict-resolution": True, "interfaces-config": { @@ -75,7 +68,7 @@ def base(subnet4): "authoritative": True, "renew-timer": 900, "rebind-timer": 1800, - "valid-lifetime": 3600, + "valid-lifetime": 3600, # TODO 4 timer "option-def": [ { "name": "image-file-name", diff --git a/tools/dhcpns/config/dhcp6.py b/tools/dhcpns/config/dhcp6.py index 4799fa1..b32fb09 100644 --- a/tools/dhcpns/config/dhcp6.py +++ b/tools/dhcpns/config/dhcp6.py @@ -40,7 +40,7 @@ def base(subnet6): "renew-timer": 900, "rebind-timer": 1800, "preferred-lifetime": 3000, - "valid-lifetime": 3600, + "valid-lifetime": 3600, # TODO 4 timer "option-data": [ { "name": "dns-servers", diff --git a/tools/dhcpns/tests/__init__.py b/tools/dhcpns/tests/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/tools/dhcpns/tests/__init__.py +++ /dev/null |