pmcf 6.69.1 → 6.70.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.69.1",
+  "version": "6.70.0",
   "publishConfig": {
     "access": "public"
   },
@@ -60,7 +60,7 @@
     "yaml": "^2.9.1"
   },
   "devDependencies": {
-    "@types/node": "^26.6.4",
+    "@types/node": "^26.6.5",
     "ava": "^8.0.1",
     "c8": "^12.0.0",
     "documentation": "^14.0.3",

package/src/base.mjs

@@ -118,10 +118,6 @@ export class base extends core {
     return this.owner?.network;
   }
 
-  get smtpServer() {
-    return this.owner?.smtpServer;
-  }
-
   get domain() {
     return this.owner?.domain;
   }

package/src/host.mjs

@@ -137,8 +137,8 @@ export class host extends ServiceOwner {
     return new AggregatedMap([
       this._services,
       ...[...this.networkInterfaces.values()]
-        .filter(ni => ni.services.size > 0)
-        .map(ni => ni._services)
+        .filter(ni => ni.ownServices.size > 0)
+        .map(ni => ni.ownServices)
     ]);
   }
 
@@ -212,7 +212,7 @@ export class host extends ServiceOwner {
 
   get network() {
     for (const ni of this.networkInterfaces.values()) {
-      if (ni._kind !== "loopback" && ni._network) {
+      if (ni._network) {
         return ni._network;
       }
     }

package/src/owner.mjs

@@ -33,11 +33,6 @@ export class owner extends ServiceOwner {
     networkInterfaces: networkInterfaces_attribute,
     owners: owners_attribute,
     country: { ...string_attribute_writable, name: "country" },
-    smtpServer: {
-      ...string_attribute_writable,
-      name: "smtpServer",
-      deferredExpression: true
-    },
     domain: { ...string_attribute_writable, name: "domain" },
     domains: { ...string_set_attribute_writable, skipEmpty: true, name: "domains" },
     timezone: { ...string_attribute_writable, name: "timezone" },

package/src/service-owner.mjs

@@ -19,4 +19,8 @@ export class ServiceOwner extends base {
   get services() {
     return this._services;
   }
+
+  get ownServices() {
+    return this._services;
+  }
 }

package/src/services/keepalived.mjs

@@ -2,11 +2,13 @@ import { join } from "node:path";
 import {
   default_attribute_writable,
   default_collection_attribute_writable,
+  string_attribute_writable,
   enum_string_attribute_writable,
   priority_attribute_writable,
   email_attribute_writable
 } from "pacc";
 import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
+import { SOURCES_THIS_EXTENDS } from "../common-attributes.mjs";
 import { addType } from "../type.mjs";
 import { PROTOCOL_TCP } from "../constants.mjs";
 import { core } from "../core.mjs";
@@ -84,10 +86,18 @@ export class keepalived extends CoreService {
       type: keepalive_cluster_member,
       name: "clusters"
     },
+    smtp_server: {
+      ...string_attribute_writable,
+      name: "smtp_server",
+      deferredExpression: true,
+      scope: SCOPE_KEEPALIVED
+    },
+
     notification_email_from: {
       ...email_attribute_writable,
       name: "notification_email_from",
       default: "keepalived",
+      sources: SOURCES_THIS_EXTENDS,
       scope: SCOPE_KEEPALIVED
     }
   };
@@ -103,10 +113,10 @@ export class keepalived extends CoreService {
 
     const extra = [];
 
-    const smtpServer = this.smtpServer;
+    const smtp_server = this.smtp_server;
 
-    if (smtpServer) {
-      extra.push(`  smtp_server ${smtpServer.address}`);
+    if (smtp_server) {
+      extra.push(`  smtp_server ${smtp_server.address}`);
     }
 
     const cfg = [