pmcf 6.67.0 → 6.67.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.67.0",
+  "version": "6.67.2",
   "publishConfig": {
     "access": "public"
   },

package/src/services/kea.mjs

@@ -27,6 +27,7 @@ import {
 } from "pmcf";
 import { FAMILY_UNIX, PROTOCOL_TCP } from "../constants.mjs";
 import { writeLines } from "../utils.mjs";
+import { dnsFullName } from "../dns-utils.mjs";
 
 class kea_subnet extends Subnet {
   static attributes = {
@@ -354,10 +355,11 @@ export class kea extends CoreService {
       }
     ];
 
-    const dnsServersSlot = names =>
+    const dnsServersSlot = (names, keyName) =>
       names.map(name => {
         return {
-          name,
+          name: dnsFullName(name),
+          "key-name": keyName,
           "dns-servers": asArray(this.dnsServerEndpoints)
             .filter(
               endpoint =>
@@ -372,6 +374,8 @@ export class kea extends CoreService {
 
     const ddnsEndpoint = this.endpoint("kea-dhcp-ddns");
 
+    const keyName = asArray(this.keys)[0].name;
+
     const ddns = {
       DhcpDdns: {
         "ip-address": ddnsEndpoint.address,
@@ -388,11 +392,12 @@ export class kea extends CoreService {
           };
         }),
         "forward-ddns": {
-          "ddns-domains": dnsServersSlot([...this.domains])
+          "ddns-domains": dnsServersSlot([...this.domains], keyName)
         },
         "reverse-ddns": {
           "ddns-domains": dnsServersSlot(
-            subnets.map(s => s.prefix).map(prefix => reverseArpa(prefix))
+            subnets.map(s => s.prefix).map(prefix => reverseArpa(prefix)),
+            keyName
           )
         },
         loggers
@@ -435,7 +440,9 @@ export class kea extends CoreService {
                 : { "ip-address": addr };
           }
 
-          let other = {};
+          const other = {
+            "hw-address": k
+          };
 
           switch (family) {
             case "4":
@@ -443,6 +450,7 @@ export class kea extends CoreService {
                 const dhcpClientId = networkInterface.dhcpClientId;
                 if (dhcpClientId !== undefined) {
                   other["client-id"] = dhcpClientId;
+                  delete other["hw-address"];
                 }
               }
               break;
@@ -454,9 +462,8 @@ export class kea extends CoreService {
           }
 
           return {
-            ...ip,
-            "hw-address": k,
             hostname: networkInterface.domainName,
+            ...ip,
             ...other
           };
         })