pmcf 6.68.15 → 6.69.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.68.15",
+  "version": "6.69.1",
   "publishConfig": {
     "access": "public"
   },
@@ -54,8 +54,8 @@
     "content-entry-transform": "^1.7.11",
     "filtered-map": "^1.0.0",
     "ip-utilties": "^3.13.1",
-    "npm-pkgbuild": "^22.2.19",
-    "pacc": "^14.3.0",
+    "npm-pkgbuild": "^22.2.20",
+    "pacc": "^14.4.0",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.1"
   },

package/src/core-service.mjs

@@ -165,27 +165,28 @@ export class CoreService extends base {
             this._port === undefined ? { ...e } : { ...e, port: this._port };
           delete options.kind;
 
-          for (const na of this.host.networkAddresses()) {
-            if (e.family !== FAMILY_DNS) {
-              if (
-                (e.family && e.family !== na.family) ||
-                (e.kind && e.kind !== na.networkInterface.kind)
-              ) {
-                continue;
+          if (this.host) {
+            for (const na of this.host.networkAddresses()) {
+              if (e.family !== FAMILY_DNS) {
+                if (
+                  (e.family && e.family !== na.family) ||
+                  (e.kind && e.kind !== na.networkInterface.kind)
+                ) {
+                  continue;
+                }
               }
-            }
 
-            if (e.scheme || e.pathname) {
-              const he = new url_endpoint(this, na, options);
-              if (!seen.has(he.url.toString())) {
-                seen.add(he.url.toString());
-                result.push(he);
+              if (e.scheme || e.pathname) {
+                const he = new url_endpoint(this, na, options);
+                if (!seen.has(he.url.toString())) {
+                  seen.add(he.url.toString());
+                  result.push(he);
+                }
+              } else {
+                result.push(new endpoint(this, na, options));
               }
-            } else {
-              result.push(new endpoint(this, na, options));
             }
           }
-
           if (!domainNames.has(this.domainName)) {
             domainNames.add(this.domainName);
             result.push(new domain_endpoint(this, this.domainName, options));

package/src/host.mjs

@@ -136,7 +136,9 @@ export class host extends ServiceOwner {
   get services() {
     return new AggregatedMap([
       this._services,
-      ...this._networkInterfaces.values().map(ni => ni._services)
+      ...[...this.networkInterfaces.values()]
+        .filter(ni => ni.services.size > 0)
+        .map(ni => ni._services)
     ]);
   }
 

package/src/owner.mjs

@@ -5,7 +5,7 @@ import { FilteredMap } from "filtered-map";
 import {
   string_set_attribute_writable,
   string_attribute_writable,
-  email_attribute,
+  email_attribute_writable,
   asArray
 } from "pacc";
 import { union } from "./utils.mjs";
@@ -54,9 +54,8 @@ export class owner extends ServiceOwner {
       description: "unix locale"
     },
     administratorEmail: {
-      ...email_attribute,
-      name: "administratorEmail",
-      writable: true
+      ...email_attribute_writable,
+      name: "administratorEmail"
     }
   };
 

package/src/services/keepalived.mjs

@@ -3,7 +3,8 @@ import {
   default_attribute_writable,
   default_collection_attribute_writable,
   enum_string_attribute_writable,
-  priority_attribute_writable
+  priority_attribute_writable,
+  email_attribute_writable
 } from "pacc";
 import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
 import { addType } from "../type.mjs";
@@ -73,6 +74,8 @@ export class keepalive_cluster_member extends core {
 
 const states = ["master", "backup", "fault"];
 
+const SCOPE_KEEPALIVED = "keepalived";
+
 export class keepalived extends CoreService {
   static priority = 1.5;
   static attributes = {
@@ -80,6 +83,12 @@ export class keepalived extends CoreService {
       ...default_collection_attribute_writable,
       type: keepalive_cluster_member,
       name: "clusters"
+    },
+    notification_email_from: {
+      ...email_attribute_writable,
+      name: "notification_email_from",
+      default: "keepalived",
+      scope: SCOPE_KEEPALIVED
     }
   };
 
@@ -106,7 +115,7 @@ export class keepalived extends CoreService {
       "    " + this.administratorEmail,
       "  }",
       ...extra,
-      `  notification_email_from keepalived@${this.domainName}`,
+      `  notification_email_from ${this.notification_email_from}`,
       "  enable_script_security",
       "  script_user root",
       "  max_auto_priority 20",