pmcf 6.65.3 → 6.65.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.65.3",
+  "version": "6.65.5",
   "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/core-service.mjs

@@ -171,7 +171,7 @@ export class CoreService extends base {
               continue;
             }
 
-            if (e.pathname) {
+            if (e.scheme || e.pathname) {
               result.push(new HTTPEndpoint(this, na, options));
             } else {
               result.push(new Endpoint(this, na, options));

package/src/endpoint.mjs

@@ -186,6 +186,7 @@ export class HTTPEndpoint extends BaseEndpoint {
    * @param {Service} service
    * @param {string|URL} address
    * @param {object} data
+   * @param {string} data.scheme
    * @param {number} data.port
    * @param {string} data.pathname
    * @param {string} data.family
@@ -200,8 +201,11 @@ export class HTTPEndpoint extends BaseEndpoint {
     } else {
       this.family = data.family ?? address.family;
 
-      this.url = new URL(
-        (data.tls ? "https://" : "http://") +
+      const scheme = data.scheme ?
+        `${data.scheme}://` :
+        (data.tls ? "https://" : "http://");
+
+      this.url = new URL(scheme +
           (data.family === FAMILY_IPV6
             ? "[" + address.address + "]"
             : address.address) +

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 = {
@@ -145,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("}", "");
 
@@ -209,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");
 

package/src/services/openldap.mjs

@@ -10,7 +10,7 @@ export class openldap extends CoreService {
     systemdService: "slapd.service",
     systemUserName: "ldap",
     systemGroupName: "ldap",
-    extends: ["ldap", "ldapi"]
+    extends: ["ldap", "ldaps", "ldapi"]
   };
 
   static {