pmcf 6.65.2 → 6.65.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.65.2",
+  "version": "6.65.4",
   "publishConfig": {
     "access": "public"
   },
@@ -60,7 +60,7 @@
     "yaml": "^2.9.1"
   },
   "devDependencies": {
-    "@types/node": "^26.6.2",
+    "@types/node": "^26.6.3",
     "ava": "^8.0.1",
     "c8": "^12.0.0",
     "documentation": "^14.0.3",

package/src/services/keepalived.mjs

@@ -71,6 +71,8 @@ export class keepalive_cluster_member extends core {
   }
 }
 
+const states = ["master", "backup", "fault"];
+
 export class keepalived extends CoreService {
   static priority = 1.5;
   static attributes = {
@@ -123,19 +125,14 @@ export class keepalived extends CoreService {
 
       cfg.push(`  interface ${ni.name}`);
 
+      cfg.push("  virtual_ipaddress {");
+
       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("  }");
 
       cfg.push(`  virtual_router_id ${cluster.id}`);
 
@@ -150,19 +147,19 @@ export class keepalived extends CoreService {
       cfg.push("  advert_int 5");
       cfg.push("  authentication {");
       cfg.push("    auth_type PASS");
-      cfg.push("    auth_pass pass1234");
       cfg.push(
-        `    # auth_pass file:\${_ENV CREDENTIALS_DIRECTORY}/keepalived.${cluster.name}.password`
+        `    auth_pass file:\${_ENV CREDENTIALS_DIRECTORY}/keepalived.${cluster.name}.password`
       );
+      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"`
-      );
+      for (const state of states) {
+        cfg.push(
+          `  notify_${state} "/usr/bin/systemctl start ${clusterName}-${state}.target"`
+        );
+      }
 
       cfg.push("}", "");
 
@@ -214,37 +211,19 @@ export class keepalived extends CoreService {
         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`
-        ]
-      );
+      for (const state of states) {
+        await writeLines(
+          join(dir, "/usr/lib/systemd/system"),
+          `${clusterName}-${state}.target`,
+          [
+            "[Unit]",
+            `Description=${state} state of cluster ${clusterName}`,
+            "PartOf=keepalived.service",
+            `Conflicts=${states.filter(s=>s!==state).map(other=>`${clusterName}-${other}.target`).join(' ')}`
+          ]
+        );
+      }
 
       await this.writeSystemdCredentialConfig(dir, "keepalived.service");