pmcf 6.49.15 → 6.49.17

package/package.json

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

package/src/services/chrony.mjs

@@ -1,6 +1,5 @@
 import { join } from "node:path";
-import { FileContentProvider } from "npm-pkgbuild";
-import { default_collection_attribute_writable } from "pacc";
+import { default_collection_attribute_writable, asArray } from "pacc";
 import { addType, FAMILY_UNIX, FAMILY_IPV4_IPV6, CoreService } from "pmcf";
 import { writeLines } from "../utils.mjs";
 
@@ -11,12 +10,6 @@ export class chrony extends CoreService {
       type: "endpoint",
       name: "servers",
       deferredExpression: true
-    },
-    peers: {
-      ...default_collection_attribute_writable,
-      type: "endpoint",
-      name: "peers",
-      deferredExpression: true
     }
   };
 
@@ -68,9 +61,7 @@ export class chrony extends CoreService {
     }
 
     const lines = [
-      this.servers.flat().map(chronyServer),
-      this.peers
-        .flat()
+      asArray(this.servers)
         .filter(endpoint => !endpoint.service.host.isMember(host))
         .map(chronyServer),
       `mailonchange ${this.administratorEmail} 0.5`,

package/src/services/kea.mjs

@@ -12,7 +12,8 @@ import {
   number_attribute_writable,
   boolean_attribute_writable_true,
   default_collection_attribute_writable,
-  extendingAttributeIterator
+  extendingAttributeIterator,
+  asArray
 } from "pacc";
 import {
   addType,
@@ -249,7 +250,7 @@ export class kea extends CoreService {
                     "http-listener-threads": 2,
                     "http-client-threads": 2
                   },*/
-                  peers: peers
+                  peers: asArray(peers)
                     .sort(sortDescendingByPriority)
                     .reduce((a, kea) => {
                       if (!kea.host.isCluster) {
@@ -284,14 +285,15 @@ export class kea extends CoreService {
         "option-data": [
           {
             name: family == 4 ? "domain-name-servers" : "dns-servers",
-            data: dnsServerEndpoints
-              .filter(
-                endpoint =>
-                  endpoint.family === `IPv${family}` &&
-                  addressType(endpoint.address) !== ADDRESS_TYPE_LOOPBACK
-              )
-              .map(endpoint => endpoint.address)
-              .join(",")
+            data: asArray(
+              dnsServerEndpoints
+                .filter(
+                  endpoint =>
+                    endpoint.family === `IPv${family}` &&
+                    addressType(endpoint.address) !== ADDRESS_TYPE_LOOPBACK
+                )
+                .map(endpoint => endpoint.address)
+            ).join(",")
           },
           {
             name: "domain-search",