pmcf 6.53.1 → 6.53.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.53.1",
+  "version": "6.53.3",
   "publishConfig": {
     "access": "public"
   },
@@ -59,7 +59,7 @@
     "yaml": "^2.9.1"
   },
   "devDependencies": {
-    "@types/node": "^26.5.1",
+    "@types/node": "^26.6.1",
     "ava": "^8.0.1",
     "c8": "^12.0.0",
     "documentation": "^14.0.3",

package/src/services/bind.mjs

@@ -16,7 +16,8 @@ import {
   integer_attribute_writable,
   integer_attribute,
   secret_attribute_writable,
-  asArray
+  asArray,
+  leafValues
 } from "pacc";
 import {
   base,
@@ -858,15 +859,25 @@ export class bind extends CoreService {
   }
 
   async writeServers(outputControl) {
+
+    // TODO 
+    const all = new Map();
+    for (const service of this.primaries) {
+      for (const subnet of service.host.network.subnets.values()) {
+        //console.log("SA", subnet.fullName);
+        all.set(subnet.address, service);
+      }
+    }
+
     await writeLines(
       join(outputControl.dir, "etc/named"),
       `servers.conf`,
-      asArray(this.primaries).map(service => {
+      all.entries().map(([subnet, service]) => {
         return [
-          `server ${service.address()} {`,
+          `server ${subnet} {`,
           "    keys {" +
             asArray(service.keys.values())
-            .filter(key=>key.tags.has('server'))
+              .filter(key => key.tags.has("server"))
               .map(key => ` ${key.name};`)
               .join("") +
             " };",

package/src/services/kea.mjs

@@ -185,6 +185,7 @@ export class kea extends CoreService {
       endpoint =>
         endpoint.type === "dhcp" &&
         endpoint.family === family &&
+        endpoint.networkInterface.enabled &&
         endpoint.networkInterface.kind !== "loopback" &&
         endpoint.networkInterface.kind !== "tun"
     ).map(endpoint => `${endpoint.networkInterface.name}/${endpoint.address}`);