pmcf 6.46.1 → 6.46.3

package/package.json

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

package/src/cluster.mjs

@@ -10,8 +10,7 @@ import {
 } from "./common-attributes.mjs";
 import { writeLines } from "./utils.mjs";
 
-export class Cluster extends Host {
-  static name = "cluster";
+export class cluster extends Host {
   static priority = 1.5;
   static attributes = {
     masters: {
@@ -41,17 +40,24 @@ export class Cluster extends Host {
 
   masters = [];
   backups = [];
-  routerId = 100;
   checkInterval = 60;
 
-  get content() {
-    return this.masters.map(m => m.host)[0]?.content;
-  }
-
   get members() {
     return new Set(this.masters).union(new Set(this.backups));
   }
 
+  isMember(host) {
+    return super.isMember(host) || this.hosts.get(host.name) === host;
+  }
+
+  get hosts() {
+    return new Map([...this.members].map(m => [m.host.name, m.host]));
+  }
+
+  get content() {
+    return [...this.hosts.values()][0]?.content;
+  }
+
   async *preparePackages(stagingDir) {
     for (const ni of [...this.owner.clusters.values()].reduce(
       (all, cluster) => all.union(cluster.members),

package/src/core.mjs

@@ -219,8 +219,8 @@ export class core {
   mapFromDirections(directions, property) {
     return new AggregatedMap(
       [...this.walkDirections(directions)]
+        .filter(node => node?.[property])
         .map(node => node[property])
-        .filter(node => node !== undefined)
     );
   }
 
@@ -235,9 +235,6 @@ export class core {
     for (const node of this.walkDirections(directions)) {
       const value = node[property];
       if (value !== undefined) {
-        if (!(value instanceof Set)) {
-          console.log("NO SET", value, node.fullName, property);
-        }
         collected = collected.union(value);
       }
     }

package/src/host.mjs

@@ -178,6 +178,10 @@ export class Host extends ServiceOwner {
     return parts[parts.length - 1].toLowerCase();
   }
 
+  isMember(host) {
+    return this === host;
+  }
+
   get services() {
     return new AggregatedMap([
       this._services,
@@ -318,7 +322,7 @@ export class Host extends ServiceOwner {
     const packageData = await this.packageData;
 
     packageData.sources.push(
-      ...await Array.fromAsync(this.templateContent()),
+      ...(await Array.fromAsync(this.templateContent())),
       new FileContentProvider({
         dir,
         pattern: ["**/*", "**/.ssh/*"],

package/src/keepalived.mjs

@@ -0,0 +1,3 @@
+import { cluster } from "./cluster.mjs";
+
+export class keepalived extends cluster {}

package/src/module.mjs

@@ -2,6 +2,8 @@ export * from "./type.mjs";
 export * from "./core.mjs";
 export * from "./base.mjs";
 export * from "./cluster.mjs";
+export * from "./keepalived.mjs";
+
 export * from "./owner.mjs";
 export * from "./root.mjs";
 export * from "./subnet.mjs";

package/src/services/chrony.mjs

@@ -1,12 +1,7 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import { default_collection_attribute_writable } from "pacc";
-import {
-  addType,
-  FAMILY_UNIX,
-  FAMILY_IPV4_IPV6,
-  CoreService
-} from "pmcf";
+import { addType, FAMILY_UNIX, FAMILY_IPV4_IPV6, CoreService } from "pmcf";
 import { writeLines } from "../utils.mjs";
 
 export class chrony extends CoreService {
@@ -83,11 +78,12 @@ export class chrony extends CoreService {
 
       return values.join(" ");
     }
+
     const lines = [
       this.servers.flat().map(chronyServer),
       this.peers
         .flat()
-        .filter(endpoint => endpoint.host !== host)
+        .filter(endpoint => !endpoint.service.host.isMember(host))
         .map(chronyServer),
       `mailonchange ${this.administratorEmail} 0.5`,
       "local stratum 10 orphan",