pmcf 1.64.4 → 1.64.6

package/package.json

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

package/src/base.mjs

@@ -284,6 +284,10 @@ export class Base {
     return this.owner?.timezone;
   }
 
+  get smtp() {
+    return this.findService({ type: "smtp" });
+  }
+
   findService(filter) {
     let best;
     for (const service of this.findServices(filter)) {

package/src/cluster.mjs

@@ -80,9 +80,11 @@ export class Cluster extends Host {
         "   notification_email {",
         "    " + this.administratorEmail,
         "  }",
-        "  smtp_server 192.168.1.1",
+        `  smtp_server ${this.smtp.rawAddress}`,
         `  notification_email_from keepalived@${host.domainName}`,
-        "}"
+        `  lvs_id ${host.hostName}`,
+        "}",
+        ""
       ];
 
       for (const cluster of [...this.owner.clusters()].sort((a, b) =>
@@ -98,6 +100,7 @@ export class Cluster extends Host {
         cfg.push("  }");
         cfg.push(`  virtual_router_id ${cluster.routerId}`);
         cfg.push(`  priority ${host.priority}`);
+        cfg.push("  smtp_alert");
         cfg.push("  advert_int 5");
         cfg.push("  authentication {");
         cfg.push("    auth_type PASS");

package/src/owner.mjs

@@ -146,9 +146,9 @@ export class Owner extends Base {
     return this.typeNamed("host", name);
   }
 
-  * hosts() {
-    yield * this.typeList("host");
-    yield * this.typeList("cluster");
+  *hosts() {
+    yield* this.typeList("host");
+    yield* this.typeList("cluster");
   }
 
   networkNamed(name) {
@@ -225,7 +225,10 @@ export class Owner extends Base {
       }
 
       for (const nameOrNetwork of asIterator(destinationNetworks)) {
-        const other = nameOrNetwork instanceof Owner ? nameOrNetwork : this.networkNamed(nameOrNetwork);
+        const other =
+          nameOrNetwork instanceof Owner
+            ? nameOrNetwork
+            : this.networkNamed(nameOrNetwork);
         if (other) {
           if (!bridge.has(other)) {
             bridge.add(other);
@@ -360,4 +363,5 @@ export class Owner extends Base {
       yield location.domain;
     }
   }
+
 }

package/src/service.mjs

@@ -21,7 +21,6 @@ const ServiceTypeDefinition = {
   extends: Base.typeDefinition,
   properties: {
     ipAddresses: { type: "string", collection: true, writeable: true },
-    addresses: { type: "string", collection: true, writeable: true },
     port: { type: "number", collection: false, writeable: true },
     protocol: { type: "string", collection: false, writeable: true },
     alias: { type: "string", collection: false, writeable: true },

package/types/base.d.mts

@@ -62,6 +62,7 @@ export class Base {
     get locales(): any;
     get country(): any;
     get timezone(): any;
+    get smtp(): any;
     findService(filter: any): any;
     findServices(filter: any): Generator<any, void, any>;
     set directory(directory: any);

package/types/service.d.mts

@@ -46,11 +46,6 @@ export class Service extends Base {
                 collection: boolean;
                 writeable: boolean;
             };
-            addresses: {
-                type: string;
-                collection: boolean;
-                writeable: boolean;
-            };
             port: {
                 type: string;
                 collection: boolean;