pmcf 6.62.1 → 6.63.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.62.1",
+  "version": "6.63.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.3",
+    "pacc": "^11.17.4",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.1"
   },

package/src/base.mjs

@@ -19,7 +19,7 @@ import {
   boolean_attribute_writable,
   default_attribute_writable
 } from "pacc";
-import { union } from "./utils.mjs";
+import { union, writeLines } from "./utils.mjs";
 import { addType } from "./type.mjs";
 import { core } from "./core.mjs";
 import { owner_attribute, aliases_attribute } from "./common-attributes.mjs";
@@ -210,6 +210,30 @@ export class base extends core {
     return this.constructor.name;
   }
 
+  async writeSystemdCredentialConfig(dir, serviceName) {
+    let lines = [];
+
+    const seen = new Set();
+
+    for (const [credentialName, cred] of this.credentials) {
+      if (cred.tags.has(serviceName) && !seen.has(credentialName)) {
+        seen.add(credentialName);
+        lines.push(
+          `LoadCredentialEncrypted=${cred.localName}:/etc/credstore.encrypted/${credentialName}`
+        );
+      }
+    }
+
+    if (lines.length) {
+      await writeLines(
+        join(dir, `usr/lib/systemd/system/${serviceName}.d`),
+        `credentials.conf`,
+        "[Service]",
+        lines
+      );
+    }
+  }
+
   set content(value) {
     this._content = value;
   }

package/src/core-service.mjs

@@ -10,9 +10,7 @@ import {
   string_set_attribute_writable,
   number_attribute_writable,
   priority_attribute,
-  default_collection_attribute_writable,
-  asArray,
-  boolean_attribute_writable_false
+  asArray
 } from "pacc";
 import {
   base,
@@ -22,12 +20,12 @@ import {
   HTTPEndpoint,
   unix_endpoint
 } from "pmcf";
-import { writeLines } from "./utils.mjs";
 import { addType } from "./type.mjs";
 import { FAMILY_UNIX, FAMILY_DNS } from "./constants.mjs";
 import {
   networkAddressAttributes,
-  extends_attribute,credentials_attribute,
+  extends_attribute,
+  credentials_attribute,
   networkInterfaces_attribute,
   endpointAttributes
 } from "./common-attributes.mjs";
@@ -267,30 +265,6 @@ export class CoreService extends base {
     return serviceTypes(ServiceTypes[this.type]);
   }
 
-  async writeSystemdCredentialConfig(dir, serviceName) {
-    let lines = [];
-
-    const seen = new Set();
-
-    for (const [credentialName, cred] of this.credentials) {
-      if (cred.tags.has(serviceName) && !seen.has(credentialName)) {
-        seen.add(credentialName);
-        lines.push(
-          `LoadCredentialEncrypted=${credentialName}:/etc/credstore.encrypted/${credentialName}`
-        );
-      }
-    }
-
-    if (lines.length) {
-      await writeLines(
-        join(dir, `usr/lib/systemd/system/${serviceName}.d`),
-        `credentials.conf`,
-        "[Service]",
-        lines
-      );
-    }
-  }
-
   get systemdService() {
     return (
       this.attribute("_systemdService") ??

package/src/credential.mjs

@@ -1,8 +1,21 @@
+import { string_attribute_writable } from "pacc";
 import { base } from "./base.mjs";
 import { addType } from "./type.mjs";
 
 export class credential extends base {
+  static attributes = {
+    localName: { ...string_attribute_writable, name: "localName" }
+  };
+
   static {
     addType(this);
   }
+
+  get localName() {
+    return this._localName ?? this.name;
+  }
+
+  set localName(value) {
+    this._localName = value;
+  }
 }

package/src/keepalived.mjs

@@ -2,9 +2,12 @@ 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 {
@@ -14,7 +17,8 @@ export class keepalived extends cluster {
       ...duration_attribute_writable,
       name: "checkInterval",
       default: 60
-    }
+    },
+    credentials: credentials_attribute
   };
 
   static {
@@ -22,6 +26,7 @@ export class keepalived extends cluster {
   }
 
   checkInterval = 60;
+  credentials = new Map();
 
   async *preparePackages(stagingDir) {
     for (const ni of [...this.owner.clusters.values()].reduce(
@@ -55,7 +60,6 @@ export class keepalived extends cluster {
         ""
       ];
 
-      const credentials = new Map();
       for (const cluster of [...this.owner.clusters.values()].sort((a, b) =>
         a.name.localeCompare(b.name)
       )) {
@@ -87,16 +91,20 @@ export class keepalived extends cluster {
           reducedPrio = cluster.backups.indexOf(ni) + 5;
         }
 
-        const credential = name.toUpperCase() + "_PASSWORD";
-        credentials.set(credential, name);
+        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 " + credential + "}");
-        cfg.push("    # auth_pass ${" + credential + "}");
+        cfg.push("    # auth_pass ${_ENV " + cred.localName + "}");
+        cfg.push("    # auth_pass ${" + cred.localName + "}");
         cfg.push("  }");
 
         cfg.push(
@@ -191,19 +199,7 @@ export class keepalived extends cluster {
           ]
         );
 
-        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 this.writeSystemdCredentialConfig(packageStagingDir, "keepalived.service");
       }
 
       await writeLines(