pmcf 6.50.3 → 6.52.0

package/package.json

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

package/src/core-service.mjs

@@ -401,9 +401,9 @@ export function serviceEndpoints(sources, options = {}) {
   return options.join ? res.join(options.join) : res;
 }
 
-export function endpoints(entries) {
+export function endpoints(entries,filter) {
   return asArray(entries)
-    .map(e => e.endpoints())
+    .map(e => e.endpoints(filter))
     .flat();
 }
 

package/src/services/bind.mjs

@@ -248,6 +248,7 @@ export class bind_key extends base {
       `${this.name}.conf`,
       [
         `key "${this.name}" {`,
+        `  # ` + asArray(this.tags).join(','),
         `  algorithm ${this.algorithm};`,
         `  secret "${this.secret}";`,
         "};"
@@ -319,7 +320,7 @@ const acl_attribute = {
 class bind_view extends bind_object {
   static priority = 1;
   static attributes = {
-        notify: { ...boolean_attribute_writable_false, name: "notify" },
+    notify: { ...boolean_attribute_writable_false, name: "notify" },
     hasCatalog: { ...boolean_attribute_writable_false, name: "hasCatalog" },
     hasForeignDomainRecords: {
       ...boolean_attribute_writable_false,
@@ -358,7 +359,11 @@ class bind_view extends bind_object {
     },
     retry: { ...duration_attribute_writable, name: "retry", default: 72000 },
     expire: { ...duration_attribute_writable, name: "expire", default: 600000 },
-    minimum: { ...duration_attribute_writable, name: "minimum", default: 60000 },
+    minimum: {
+      ...duration_attribute_writable,
+      name: "minimum",
+      default: 60000
+    },
     sharedWith: {
       ...default_attribute_writable,
       name: "sharedWith",
@@ -408,7 +413,7 @@ class bind_view extends bind_object {
       type: bind_zone_config,
       backpointer: owner_attribute,
       name: "zoneConfigs"
-    },
+    }
   };
 
   static {
@@ -851,6 +856,24 @@ export class bind extends CoreService {
     return false;
   }
 
+  async writeServers(outputControl) {
+    await writeLines(
+      join(outputControl.dir, "etc/named"),
+      `servers.conf`,
+      asArray(this.primaries).map(service => {
+        return [
+          `server ${service.address()} {`,
+          "    keys {" +
+            asArray(service.keys.values())
+              .map(key => ` ${key.name};`)
+              .join("") +
+            " };",
+          "};"
+        ];
+      })
+    );
+  }
+
   async *preparePackages(dir) {
     const packageData = await this.preparePackage(dir);
 
@@ -877,7 +900,10 @@ export class bind extends CoreService {
       hasContent ||= present;
     }
 
-    const present = await this.writeForwarders(outputControl);
+    let present;
+    present = await this.writeServers(outputControl);
+
+    present = await this.writeForwarders(outputControl);
 
     if (hasContent || present) {
       yield packageData;

package/src/services/kea.mjs

@@ -20,7 +20,8 @@ import {
   Subnet,
   CoreService,
   Endpoint,
-  sortDescendingByPriority
+  sortDescendingByPriority,
+  bind_key
 } from "pmcf";
 import { FAMILY_UNIX, PROTOCOL_TCP } from "../constants.mjs";
 import { writeLines } from "../utils.mjs";
@@ -53,6 +54,12 @@ export class kea extends CoreService {
       name: "peers",
       deferredExpression: true
     },
+    keys: {
+      ...default_collection_attribute_writable,
+      name: "keys",
+      type: bind_key,
+      deferredExpression: true
+    },
     dnsServerEndpoints: {
       ...default_collection_attribute_writable,
       type: Endpoint,
@@ -347,7 +354,15 @@ export class kea extends CoreService {
         "ip-address": ddnsEndpoint.address,
         port: ddnsEndpoint.port,
         "control-socket": toSocket(this.endpoint("kea-control-ddns")),
-        "tsig-keys": [],
+        "tsig-keys": [
+          asArray(this.keys).map(key => {
+            return {
+              name: key.name,
+              algorithm: key.algorithm,
+              secret: key.secret
+            };
+          })
+        ],
         "forward-ddns": {
           "ddns-domains": dnsServersSlot([...this.domains])
         },