pmcf 1.64.1 → 1.64.3

package/package.json

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

package/src/cluster.mjs

@@ -75,9 +75,15 @@ export class Cluster extends Host {
       const name = `keepalived-${host.name}`;
       const packageStagingDir = join(stagingDir, name);
 
-      const cfg = ["global_defs {", "   notification_email {", "    " + this.administratorEmail, "  }",
+      const cfg = [
+        "global_defs {",
+        "   notification_email {",
+        "    " + this.administratorEmail,
+        "  }",
         "  smtp_server 192.168.1.1",
-        "}"];
+        `  notification_email_from keepalived@${host.domainName}`,
+        "}"
+      ];
 
       for (const cluster of [...this.owner.clusters()].sort((a, b) =>
         a.name.localeCompare(b.name)
@@ -101,7 +107,6 @@ export class Cluster extends Host {
         cfg.push("");
 
         for (const service of cluster.findServices({ type: "http" })) {
-          console.log("S", service.host.name, service.name);
           cfg.push(`virtual_server ${cluster.rawAddress} ${service.port} {`);
           cfg.push("  delay_loop 6");
           cfg.push("  lb_algo wlc");

package/src/location.mjs

@@ -47,7 +47,6 @@ export class Location extends Owner {
   }
 
   async *preparePackages(stagingDir) {
-
     await this.loadPackageHooks(
       new URL("location.install", import.meta.url).pathname
     );
@@ -90,12 +89,8 @@ export class Location extends Owner {
 
       result.properties.name = `${this.typeName}-${this.name}`;
 
-      result.properties.provides = [
-        "location",
-        "mf-location",
-        `mf-location-${this.name}`
-      ];
-      result.properties.depends = {"jq":">=1.6"};
+      result.properties.provides = ["location", "mf-location"];
+      result.properties.depends = { jq: ">=1.6" };
       result.properties.replaces = [`mf-location-${this.name}`];
 
       result.sources.push(

package/src/service.mjs

@@ -79,18 +79,15 @@ export class Service extends Base {
     return this;
   }
 
-  get server()
-  {
+  get server() {
     return this.owner;
   }
 
-  get domainName()
-  {
+  get domainName() {
     return this.server.domainName;
   }
 
-  get rawAddress()
-  {
+  get rawAddress() {
     return this.#ipAddresses?.[0] || this.server.rawAddress;
   }
 
@@ -119,7 +116,14 @@ export class Service extends Base {
   }
 
   get priority() {
-    return this.#priority || this.owner.priority || 99;
+    if (this.#priority !== undefined) {
+      return this.#priority;
+    }
+    if (this.owner.priority !== undefined) {
+      return this.owner.priority;
+    }
+
+    return 99;
   }
 
   set weight(value) {