pmcf 6.26.1 → 6.26.3

package/package.json

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

package/src/cluster.mjs

@@ -88,7 +88,7 @@ export class Cluster extends Host {
         ""
       ];
 
-      const credentials = [];
+      const credentials = new Map();
       for (const cluster of [...this.owner.clusters.values()].sort((a, b) =>
         a.name.localeCompare(b.name)
       )) {
@@ -121,7 +121,7 @@ export class Cluster extends Host {
         }
 
         const credential = name.toUpperCase() + "_PASSWORD";
-        credentials.push(credential);
+        credentials.set(credential,name);
         cfg.push(`  priority ${host.priority - reducedPrio}`);
         cfg.push("  smtp_alert");
         cfg.push("  advert_int 5");
@@ -150,11 +150,9 @@ export class Cluster extends Host {
           cfg.push(`  protocol ${endpoint.protocol.toUpperCase()}`);
 
           for (const member of this.members) {
-            const memberService = Array.from(
-              member.expression(`services[types[${endpoint.type}]][0]`)
-            );
+            const memberService = member.expression(`services[types[${endpoint.type}]][0]`); 
 
-            console.log(member.fullName, endpoint.type, memberService);
+            console.log(member.fullName, endpoint.type, memberService?.fullName);
             cfg.push(`  real_server ${member.address} ${memberService.port} {`);
             cfg.push(`    weight ${memberService.weight}`);
 
@@ -223,9 +221,9 @@ export class Cluster extends Host {
           "credentials.conf",
           [
             "[Service]",
-            ...credentials.map(
-              c =>
-                `LoadCredentialEncrypted=${c}:/etc/credstore.encrypted/keepalived.password`
+            ...credentials.entries().map(
+              ([credName,instance]) =>
+                `LoadCredentialEncrypted=${credName}:/etc/credstore.encrypted/keepalived.${instance}.password`
             )
           ]
         );

package/src/services/systemd-journal-remote.mjs

@@ -73,6 +73,7 @@ export class SystemdJournalRemoteService extends CoreService {
   };
   static service = {
     systemdService: "systemd-journal-remote.service",
+    //extends: ["http"],
     endpoints: [
       {
         family: FAMILY_IPV4,