pmcf 6.63.1 → 6.64.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.63.1",
+  "version": "6.64.1",
   "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.4",
+    "pacc": "^11.17.5",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.1"
   },

package/src/cluster.mjs

@@ -1,39 +1,29 @@
+import  { duration_attribute_writable} from "pacc";
 import { host } from "./host.mjs";
+
 import { addType } from "./type.mjs";
-import {
-  networkInterfaces_attribute,
-  cluster_attribute
-} from "./common-attributes.mjs";
+import { networkInterfaces_attribute } from "./common-attributes.mjs";
 
 export class cluster extends host {
   static priority = 1.5;
   static attributes = {
-    masters: {
-      ...networkInterfaces_attribute,
-      name: "masters",
-      backpointer: cluster_attribute
-    },
-    backups: {
-      ...networkInterfaces_attribute,
-      name: "backups",
-      backpointer: cluster_attribute
-    },
     members: {
       ...networkInterfaces_attribute,
       name: "members"
-    }
+    },
+        checkInterval: {
+          ...duration_attribute_writable,
+          name: "checkInterval",
+          default: 60
+        },
+    
   };
 
   static {
     addType(this);
   }
 
-  masters = [];
-  backups = [];
-
-  get members() {
-    return new Set(this.masters).union(new Set(this.backups));
-  }
+  members = new Set();
 
   get isCluster() {
     return true;

package/src/module.mjs

@@ -6,7 +6,6 @@ export * from "./common-attributes.mjs";
 export * from "./base.mjs";
 export * from "./credential.mjs";
 export * from "./cluster.mjs";
-export * from "./keepalived.mjs";
 
 export * from "./owner.mjs";
 export * from "./site.mjs";
@@ -28,6 +27,7 @@ export * from "./core-service.mjs";
 export * from "./service.mjs";
 export * from "./extra-source-service.mjs";
 export * from "./endpoint.mjs";
+
 export * from "./services/bind.mjs";
 export * from "./services/chrony.mjs";
 export * from "./services/kea.mjs";
@@ -43,4 +43,6 @@ export * from "./services/systemd-journal-remote.mjs";
 export * from "./services/systemd-journal-upload.mjs";
 export * from "./services/systemd-timesyncd.mjs";
 export * from "./services/systemd-resolved.mjs";
+export * from "./services/keepalived.mjs";
+
 export * from "./initialization-context.mjs";

package/src/services/keepalived.mjs

@@ -0,0 +1,244 @@
+import { join } from "node:path";
+import {
+  default_attribute_writable,
+  default_collection_attribute_writable,
+  enum_string_attribute_writable
+} from "pacc";
+import { FAMILY_IPV4 } from "ip-utilties";
+import { addType } from "../type.mjs";
+import { core } from "../core.mjs";
+import { credential } from "../credential.mjs";
+import { CoreService, serviceEndpoints } from "../core-service.mjs";
+import { PROTOCOL_TCP } from "../constants.mjs";
+
+import { writeLines } from "../utils.mjs";
+
+export class keepalive_cluster_member extends core {
+  static attributes = {
+    cluster: {
+      ...default_attribute_writable,
+      type: "cluster",
+      name: "cluster"
+    },
+    role: {
+      ...enum_string_attribute_writable,
+      name: "role",
+      values: new Set(["master", "backup"])
+    }
+  };
+  static key = "cluster";
+  static {
+    addType(this);
+  }
+
+  get fullName() {
+    return this.cluster?.fullName;
+  }
+
+  set cluster(value) {
+    this._cluster = value;
+    value.members.add(this);
+  }
+
+  get cluster() {
+    return this._cluster;
+  }
+
+  get host() {
+    return this.owner.host;
+  }
+
+  get address() {
+    return this.owner.owner.address;
+  }
+}
+
+export class keepalived extends CoreService {
+  static priority = 1.5;
+  static attributes = {
+    clusters: {
+      ...default_collection_attribute_writable,
+      type: keepalive_cluster_member,
+      name: "clusters"
+    }
+  };
+
+  static {
+    addType(this);
+  }
+
+  clusters = new Map();
+  checkInterval = 60;
+
+  async *preparePackages(dir) {
+    const packageData = await this.preparePackage(dir);
+
+    for (const clusterMember of this.clusters.values()) {
+      const cluster = clusterMember.cluster;
+      const host = cluster.host;
+
+      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 clusterName = cluster.name;
+      cfg.push(`vrrp_instance ${clusterName} {`);
+      cfg.push(`  state ${clusterMember.role.toUpperCase()}`);
+
+      const ni = clusterMember.owner.owner;
+
+      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 ${clusterName}`);
+        cfg.push("  }");
+      }
+
+      cfg.push(`  virtual_router_id ${cluster.id}`);
+
+      let reducedPrio = 0;
+      /*
+      let reducedPrio = cluster.masters.indexOf(ni);
+      if (reducedPrio < 0) {
+        reducedPrio = cluster.backups.indexOf(ni) + 5;
+      }
+*/
+      const cred = new credential(this);
+      cred.name = `keepalived.${clusterName}.password`;
+      cred.localName = clusterName.toUpperCase() + "_PASSWORD";
+      cred._tags.add("keepalived.service");
+      this.credentials.set(cred.name, cred);
+
+      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 " + cred.localName + "}");
+      cfg.push("    # auth_pass ${" + cred.localName + "}");
+      cfg.push("  }");
+
+      cfg.push(
+        `  notify_master "/usr/bin/systemctl start ${clusterName}-master.target"`,
+        `  notify_backup "/usr/bin/systemctl start ${clusterName}-backup.target"`,
+        `  notify_fault "/usr/bin/systemctl start ${clusterName}-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 cluster.members) {
+          const memberService = member.host.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(dir, "/usr/lib/systemd/system"),
+        `${clusterName}-master.target`,
+        [
+          "[Unit]",
+          `Description=master state of cluster ${clusterName}`,
+          "PartOf=keepalived.service",
+          `Conflicts=${clusterName}-backup.target ${clusterName}-fault.target`
+        ]
+      );
+
+      await writeLines(
+        join(dir, "/usr/lib/systemd/system"),
+        `${clusterName}-backup.target`,
+        [
+          "[Unit]",
+          `Description=backup state of cluster ${clusterName}`,
+          "PartOf=keepalived.service",
+          `Conflicts=${clusterName}-master.target ${clusterName}-fault.target`
+        ]
+      );
+
+      await writeLines(
+        join(dir, "/usr/lib/systemd/system"),
+        `${clusterName}-fault.target`,
+        [
+          "[Unit]",
+          `Description=fault state of cluster ${clusterName}`,
+          `Conflicts=${clusterName}-master.target ${clusterName}-backup.target`
+        ]
+      );
+
+      await this.writeSystemdCredentialConfig(dir, "keepalived.service");
+
+      await writeLines(join(dir, "etc/keepalived"), "keepalived.conf", cfg);
+    }
+
+    yield packageData;
+  }
+}

package/src/keepalived.mjs

@@ -1,214 +0,0 @@
-import { join } from "node:path";
-import { duration_attribute_writable } from "pacc";
-import { addType } from "./type.mjs";
-import { cluster } from "./cluster.mjs";
-import { credential } from "./credential.mjs";
-import { FAMILY_IPV4 } from "ip-utilties";
-import { serviceEndpoints } from "./core-service.mjs";
-import { PROTOCOL_TCP } from "./constants.mjs";
-import { credentials_attribute } from "./common-attributes.mjs";
-
-import { writeLines } from "./utils.mjs";
-
-export class keepalived extends cluster {
-  static priority = 1.5;
-  static attributes = {
-    checkInterval: {
-      ...duration_attribute_writable,
-      name: "checkInterval",
-      default: 60
-    },
-    credentials: credentials_attribute
-  };
-
-  static {
-    addType(this);
-  }
-
-  checkInterval = 60;
-  credentials = new Map();
-
-  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",
-        "}",
-        ""
-      ];
-
-      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 cred = new credential(this);
-        cred.name = `keepalived.${name}.password`;
-        cred.localName = name.toUpperCase() + "_PASSWORD";
-        cred._tags.add("keepalived.service");
-        this.credentials.set(cred.name, cred);
-
-        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 " + cred.localName + "}");
-        cfg.push("    # auth_pass ${" + cred.localName + "}");
-        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 this.writeSystemdCredentialConfig(packageStagingDir, "keepalived.service");
-      }
-
-      await writeLines(
-        join(packageStagingDir, "etc/keepalived"),
-        "keepalived.conf",
-        cfg
-      );
-
-      yield packageData;
-    }
-  }
-}