pmcf 6.61.4 → 6.61.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.61.4",
+  "version": "6.61.6",
   "publishConfig": {
     "access": "public"
   },
@@ -55,7 +55,7 @@
     "filtered-map": "^1.0.0",
     "ip-utilties": "^3.13.1",
     "npm-pkgbuild": "^22.2.7",
-    "pacc": "^11.17.1",
+    "pacc": "^11.17.2",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.1"
   },

package/src/cluster.mjs

@@ -1,14 +1,9 @@
-import { join } from "node:path";
-import { FAMILY_IPV4 } from "ip-utilties";
-import { duration_attribute_writable } from "pacc";
 import { host } from "./host.mjs";
-import { serviceEndpoints } from "./core-service.mjs";
 import { addType } from "./type.mjs";
 import {
   networkInterfaces_attribute,
   cluster_attribute
 } from "./common-attributes.mjs";
-import { writeLines } from "./utils.mjs";
 
 export class cluster extends host {
   static priority = 1.5;
@@ -26,11 +21,6 @@ export class cluster extends host {
     members: {
       ...networkInterfaces_attribute,
       name: "members"
-    },
-    checkInterval: {
-      ...duration_attribute_writable,
-      name: "checkInterval",
-      default: 60
     }
   };
 
@@ -40,7 +30,6 @@ export class cluster extends host {
 
   masters = [];
   backups = [];
-  checkInterval = 60;
 
   get members() {
     return new Set(this.masters).union(new Set(this.backups));
@@ -61,197 +50,4 @@ export class cluster extends 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),
-      new Set()
-    )) {
-      const host = ni.host;
-
-      const packageStagingDir = join(stagingDir, host.name);
-      const packageData = await host.preparePackage({ dir: packageStagingDir });
-
-      const extra = [];
-
-      const smtp = this.smtp;
-
-      if (smtp) {
-        extra.push(`  smtp_server ${smtp.address()}`);
-      }
-
-      const cfg = [
-        "global_defs {",
-        "   notification_email {",
-        "    " + this.administratorEmail,
-        "  }",
-        ...extra,
-        `  notification_email_from keepalived@${host.domainName}`,
-        "  enable_script_security",
-        "  script_user root",
-        "  max_auto_priority 20",
-        "}",
-        ""
-      ];
-
-      const credentials = new Map();
-      for (const cluster of [...this.owner.clusters.values()].sort((a, b) =>
-        a.name.localeCompare(b.name)
-      )) {
-        const name = cluster.name;
-        cfg.push(`vrrp_instance ${name} {`);
-        cfg.push(
-          `  state ${cluster.masters.indexOf(ni) === 0 ? "MASTER" : "BACKUP"}`
-        );
-        cfg.push(`  interface ${ni.name}`);
-
-        for (const na of cluster.networkAddresses(
-          na => na.networkInterface.kind !== "loopback"
-        )) {
-          cfg.push(
-            `  ${
-              na.family === FAMILY_IPV4
-                ? "virtual_ipaddress"
-                : "virtual_ipaddress_excluded"
-            } {`
-          );
-          cfg.push(`    ${na.cidrAddress} dev ${ni.name} label ${name}`);
-          cfg.push("  }");
-        }
-
-        cfg.push(`  virtual_router_id ${cluster.id}`);
-
-        let reducedPrio = cluster.masters.indexOf(ni);
-        if (reducedPrio < 0) {
-          reducedPrio = cluster.backups.indexOf(ni) + 5;
-        }
-
-        const credential = name.toUpperCase() + "_PASSWORD";
-        credentials.set(credential, name);
-        cfg.push(`  priority ${host.priority - reducedPrio}`);
-        cfg.push("  smtp_alert");
-        cfg.push("  advert_int 5");
-        cfg.push("  authentication {");
-        cfg.push("    auth_type PASS");
-        cfg.push("    auth_pass pass1234");
-        cfg.push("    # auth_pass ${_ENV " + credential + "}");
-        cfg.push("    # auth_pass ${" + credential + "}");
-        cfg.push("  }");
-
-        cfg.push(
-          `  notify_master "/usr/bin/systemctl start ${name}-master.target"`,
-          `  notify_backup "/usr/bin/systemctl start ${name}-backup.target"`,
-          `  notify_fault "/usr/bin/systemctl start ${name}-fault.target"`
-        );
-
-        cfg.push("}", "");
-
-        for (const endpoint of serviceEndpoints(cluster, {
-          services: "services[types[http]]",
-          endpoints: e =>
-            e.networkInterface && e.networkInterface.kind !== "loopback"
-        })) {
-          cfg.push(`virtual_server ${cluster.address} ${endpoint.port} {`);
-          cfg.push(`  delay_loop ${cluster.checkInterval}`);
-          cfg.push("  lb_algo wlc");
-          cfg.push("  persistence_timeout 600");
-          cfg.push(`  protocol ${endpoint.protocol.toUpperCase()}`);
-
-          for (const member of this.members) {
-            const memberService = member.expression(
-              `services[types[${endpoint.type}]][0]`
-            );
-
-            console.log(
-              member.fullName,
-              endpoint.type,
-              memberService?.fullName
-            );
-            cfg.push(`  real_server ${member.address} ${memberService.port} {`);
-            cfg.push(`    weight ${memberService.weight}`);
-
-            switch (endpoint.type) {
-              case "dns":
-                cfg.push(`    DNS_CHECK {`);
-                cfg.push("      type A");
-                cfg.push("      name google.com");
-                cfg.push("    }");
-                break;
-              case "smtp":
-                cfg.push(`    SMTP_CHECK {`);
-                cfg.push("    }");
-                break;
-
-              default:
-                switch (endpoint.protocol) {
-                  case PROTOCOL_TCP:
-                    cfg.push(`    TCP_CHECK {`);
-                    cfg.push("      connect_timeout 10");
-                    cfg.push("    }");
-                    break;
-                }
-            }
-
-            cfg.push("  }");
-          }
-
-          cfg.push("}", "");
-          break; // only one for now
-        }
-        await writeLines(
-          join(packageStagingDir, "/usr/lib/systemd/system"),
-          `${name}-master.target`,
-          [
-            "[Unit]",
-            `Description=master state of cluster ${name}`,
-            "PartOf=keepalived.service",
-            `Conflicts=${name}-backup.target ${name}-fault.target`
-          ]
-        );
-
-        await writeLines(
-          join(packageStagingDir, "/usr/lib/systemd/system"),
-          `${name}-backup.target`,
-          [
-            "[Unit]",
-            `Description=backup state of cluster ${name}`,
-            "PartOf=keepalived.service",
-            `Conflicts=${name}-master.target ${name}-fault.target`
-          ]
-        );
-
-        await writeLines(
-          join(packageStagingDir, "/usr/lib/systemd/system"),
-          `${name}-fault.target`,
-          [
-            "[Unit]",
-            `Description=fault state of cluster ${name}`,
-            `Conflicts=${name}-master.target ${name}-backup.target`
-          ]
-        );
-
-        await writeLines(
-          join(packageStagingDir, "/usr/lib/systemd/system/keepalived.d"),
-          "credentials.conf",
-          [
-            "[Service]",
-            ...credentials
-              .entries()
-              .map(
-                ([credName, instance]) =>
-                  `LoadCredentialEncrypted=${credName}:/etc/credstore.encrypted/keepalived.${instance}.password`
-              )
-          ]
-        );
-      }
-
-      await writeLines(
-        join(packageStagingDir, "etc/keepalived"),
-        "keepalived.conf",
-        cfg
-      );
-
-      yield packageData;
-    }
-  }
 }

package/src/common-attributes.mjs

@@ -70,6 +70,13 @@ export const owners_attribute = {
   backpointer: owner_attribute
 };
 
+export const services_attribute = {
+  ...default_collection_attribute_writable,
+  name: "services",
+  type: "service",
+  backpointer: owner_attribute
+};
+
 export const cluster_attribute = {
   ...default_attribute_writable,
   name: "cluster",

package/src/keepalived.mjs

@@ -1,6 +1,11 @@
+import { join } from "node:path";
 import { duration_attribute_writable } from "pacc";
 import { addType } from "./type.mjs";
 import { cluster } from "./cluster.mjs";
+import { FAMILY_IPV4 } from "ip-utilties";
+import { serviceEndpoints } from "./core-service.mjs";
+import { PROTOCOL_TCP } from "./constants.mjs";
+import { writeLines } from "./utils.mjs";
 
 export class keepalived extends cluster {
   static priority = 1.5;
@@ -15,4 +20,199 @@ export class keepalived extends cluster {
   static {
     addType(this);
   }
+
+    checkInterval = 60;
+
+  async *preparePackages(stagingDir) {
+    for (const ni of [...this.owner.clusters.values()].reduce(
+      (all, cluster) => all.union(cluster.members),
+      new Set()
+    )) {
+      const host = ni.host;
+
+      const packageStagingDir = join(stagingDir, host.name);
+      const packageData = await host.preparePackage({ dir: packageStagingDir });
+
+      const extra = [];
+
+      const smtp = this.smtp;
+
+      if (smtp) {
+        extra.push(`  smtp_server ${smtp.address()}`);
+      }
+
+      const cfg = [
+        "global_defs {",
+        "   notification_email {",
+        "    " + this.administratorEmail,
+        "  }",
+        ...extra,
+        `  notification_email_from keepalived@${host.domainName}`,
+        "  enable_script_security",
+        "  script_user root",
+        "  max_auto_priority 20",
+        "}",
+        ""
+      ];
+
+      const credentials = new Map();
+      for (const cluster of [...this.owner.clusters.values()].sort((a, b) =>
+        a.name.localeCompare(b.name)
+      )) {
+        const name = cluster.name;
+        cfg.push(`vrrp_instance ${name} {`);
+        cfg.push(
+          `  state ${cluster.masters.indexOf(ni) === 0 ? "MASTER" : "BACKUP"}`
+        );
+        cfg.push(`  interface ${ni.name}`);
+
+        for (const na of cluster.networkAddresses(
+          na => na.networkInterface.kind !== "loopback"
+        )) {
+          cfg.push(
+            `  ${
+              na.family === FAMILY_IPV4
+                ? "virtual_ipaddress"
+                : "virtual_ipaddress_excluded"
+            } {`
+          );
+          cfg.push(`    ${na.cidrAddress} dev ${ni.name} label ${name}`);
+          cfg.push("  }");
+        }
+
+        cfg.push(`  virtual_router_id ${cluster.id}`);
+
+        let reducedPrio = cluster.masters.indexOf(ni);
+        if (reducedPrio < 0) {
+          reducedPrio = cluster.backups.indexOf(ni) + 5;
+        }
+
+        const credential = name.toUpperCase() + "_PASSWORD";
+        credentials.set(credential, name);
+        cfg.push(`  priority ${host.priority - reducedPrio}`);
+        cfg.push("  smtp_alert");
+        cfg.push("  advert_int 5");
+        cfg.push("  authentication {");
+        cfg.push("    auth_type PASS");
+        cfg.push("    auth_pass pass1234");
+        cfg.push("    # auth_pass ${_ENV " + credential + "}");
+        cfg.push("    # auth_pass ${" + credential + "}");
+        cfg.push("  }");
+
+        cfg.push(
+          `  notify_master "/usr/bin/systemctl start ${name}-master.target"`,
+          `  notify_backup "/usr/bin/systemctl start ${name}-backup.target"`,
+          `  notify_fault "/usr/bin/systemctl start ${name}-fault.target"`
+        );
+
+        cfg.push("}", "");
+
+        for (const endpoint of serviceEndpoints(cluster, {
+          services: "services[types[http]]",
+          endpoints: e =>
+            e.networkInterface && e.networkInterface.kind !== "loopback"
+        })) {
+          cfg.push(`virtual_server ${cluster.address} ${endpoint.port} {`);
+          cfg.push(`  delay_loop ${cluster.checkInterval}`);
+          cfg.push("  lb_algo wlc");
+          cfg.push("  persistence_timeout 600");
+          cfg.push(`  protocol ${endpoint.protocol.toUpperCase()}`);
+
+          for (const member of this.members) {
+            const memberService = member.expression(
+              `services[types[${endpoint.type}]][0]`
+            );
+
+            console.log(
+              member.fullName,
+              endpoint.type,
+              memberService?.fullName
+            );
+            cfg.push(`  real_server ${member.address} ${memberService.port} {`);
+            cfg.push(`    weight ${memberService.weight}`);
+
+            switch (endpoint.type) {
+              case "dns":
+                cfg.push(`    DNS_CHECK {`);
+                cfg.push("      type A");
+                cfg.push("      name google.com");
+                cfg.push("    }");
+                break;
+              case "smtp":
+                cfg.push(`    SMTP_CHECK {`);
+                cfg.push("    }");
+                break;
+
+              default:
+                switch (endpoint.protocol) {
+                  case PROTOCOL_TCP:
+                    cfg.push(`    TCP_CHECK {`);
+                    cfg.push("      connect_timeout 10");
+                    cfg.push("    }");
+                    break;
+                }
+            }
+
+            cfg.push("  }");
+          }
+
+          cfg.push("}", "");
+          break; // only one for now
+        }
+        await writeLines(
+          join(packageStagingDir, "/usr/lib/systemd/system"),
+          `${name}-master.target`,
+          [
+            "[Unit]",
+            `Description=master state of cluster ${name}`,
+            "PartOf=keepalived.service",
+            `Conflicts=${name}-backup.target ${name}-fault.target`
+          ]
+        );
+
+        await writeLines(
+          join(packageStagingDir, "/usr/lib/systemd/system"),
+          `${name}-backup.target`,
+          [
+            "[Unit]",
+            `Description=backup state of cluster ${name}`,
+            "PartOf=keepalived.service",
+            `Conflicts=${name}-master.target ${name}-fault.target`
+          ]
+        );
+
+        await writeLines(
+          join(packageStagingDir, "/usr/lib/systemd/system"),
+          `${name}-fault.target`,
+          [
+            "[Unit]",
+            `Description=fault state of cluster ${name}`,
+            `Conflicts=${name}-master.target ${name}-backup.target`
+          ]
+        );
+
+        await writeLines(
+          join(packageStagingDir, "/usr/lib/systemd/system/keepalived.d"),
+          "credentials.conf",
+          [
+            "[Service]",
+            ...credentials
+              .entries()
+              .map(
+                ([credName, instance]) =>
+                  `LoadCredentialEncrypted=${credName}:/etc/credstore.encrypted/keepalived.${instance}.password`
+              )
+          ]
+        );
+      }
+
+      await writeLines(
+        join(packageStagingDir, "etc/keepalived"),
+        "keepalived.conf",
+        cfg
+      );
+
+      yield packageData;
+    }
+  }
 }

package/src/owner.mjs

@@ -71,10 +71,6 @@ export class owner extends ServiceOwner {
     );
   }
 
-  set hosts(value) {
-    this._hosts = value;
-  }
-
   get clusters() {
     return new FilteredMap(this.hosts, host => host.isCluster);
   }
@@ -85,10 +81,6 @@ export class owner extends ServiceOwner {
     );
   }
 
-  set networks(value) {
-    this._networks = value;
-  }
-
   get services() {
     return new AggregatedMap(
       [this, ...this.hosts.values()].map(host => host._services)

package/src/service-owner.mjs

@@ -1,18 +1,13 @@
-import { default_collection_attribute_writable } from "pacc";
-import { base, addType } from "pmcf";
-import { owner_attribute } from "./common-attributes.mjs";
+import { base } from "./base.mjs";
+import { addType } from "./type.mjs";
+import { services_attribute } from "./common-attributes.mjs";
 
 export class ServiceOwner extends base {
   static name = "service-owner";
   static priority = 1.9;
   static owners = ["owner", "site", "network", "root"];
   static attributes = {
-    services: {
-      ...default_collection_attribute_writable,
-      name: "services",
-      type: "service",
-      backpointer: owner_attribute
-    }
+    services: services_attribute
   };
 
   static {
@@ -21,10 +16,6 @@ export class ServiceOwner extends base {
 
   _services = new Map();
 
-  set services(value) {
-    this._services = value;
-  }
-
   get services() {
     return this._services;
   }

package/src/service-types.mjs

@@ -360,19 +360,19 @@ export function serviceTypes(type) {
  */
 export function serviceTypeEndpoints(type, bundeledToo) {
   if (type) {
-    const aggregator = (acc, type) => {
-      acc.push(...serviceTypeEndpoints(type, bundeledToo));
-      return acc;
+    const aggregator = (result, type) => {
+      result.push(...serviceTypeEndpoints(type, bundeledToo));
+      return result;
     };
 
     return type.extends.reduce(
       aggregator,
       type.endpoints.reduce(
-        (acc, ep) => {
-          for (const family of asArray(ep.family)) {
-            acc.push({ ...ep, family });
+        (result, endpoint) => {
+          for (const family of asArray(endpoint.family)) {
+            result.push({ ...endpoint, family });
           }
-          return acc;
+          return result;
         },
         bundeledToo ? type.services.reduce(aggregator, []) : []
       )