pmcf 2.43.0 → 2.45.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.43.0",
+  "version": "2.45.0",
   "publishConfig": {
     "access": "public"
   },
@@ -16,10 +16,10 @@
     "config management",
     "dhcp",
     "dns",
+    "iwd",
     "kea",
     "keepalived",
-    "systemd",
-    "iwd"
+    "systemd"
   ],
   "contributors": [
     {

package/src/cluster.mjs

@@ -86,12 +86,13 @@ export class Cluster extends Host {
         }
       };
 
+
       const cfg = [
         "global_defs {",
         "   notification_email {",
         "    " + this.administratorEmail,
         "  }",
-        `  smtp_server ${this.smtp.address}`,
+        `  smtp_server ${this.smtp.address()}`,
         `  notification_email_from keepalived@${host.domainName}`,
         "  enable_script_security",
         "  script_user root",

package/src/service.mjs

@@ -184,10 +184,6 @@ export class Service extends Base {
     return this.host.domainName;
   }
 
-  get ipAddressOrDomainName() {
-    return this.address ?? this.domainName;
-  }
-
   get networks() {
     return this.host.networks;
   }
@@ -209,6 +205,24 @@ export class Service extends Base {
     return filter ? result.filter(filter) : result;
   }
 
+  address(
+    options = {
+      endpoints: e => e.networkInterface?.kind !== "loopbak",
+      select: e => e.domainName||e.address,
+      limit: 1,
+      join: ""
+    }
+  ) {
+    const all = this.endpoints(options.endpoints);
+    const res = [...new Set(options.select ? all.map(options.select) : all)];
+
+    if (options.limit < res.length) {
+      res.length = options.limit;
+    }
+
+    return options.join !== undefined ? res.join(options.join) : res;
+  }
+
   set alias(value) {
     this._alias = value;
   }

package/src/services/bind.mjs

@@ -527,20 +527,19 @@ export class BINDService extends ExtraSourceService {
 
   get defaultRecords() {
     const nameService = this.findService({ type: "dns", priority: "<10" });
-    const rname = this.administratorEmail.replace(/@/, ".");
 
     const SOARecord = DNSRecord(
       "@",
       "SOA",
       dnsFullName(nameService.domainName),
-      dnsFullName(rname),
+      dnsFullName(this.administratorEmail.replace(/@/, ".")),
       `(${[...this.soaUpdates].join(" ")})`
     );
 
     const NSRecord = DNSRecord(
       "@",
       "NS",
-      dnsFullName(nameService.ipAddressOrDomainName)
+      dnsFullName(nameService.address())
     );
 
     return [SOARecord, NSRecord];

package/types/service.d.mts

@@ -313,9 +313,14 @@ export class Service extends Base {
     get host(): Host;
     hosts(): Generator<any, void, any>;
     get domainName(): any;
-    get ipAddressOrDomainName(): any;
     get networks(): Set<any>;
     endpoints(filter: any): any[];
+    address(options?: {
+        endpoints: (e: any) => boolean;
+        select: (e: any) => any;
+        limit: number;
+        join: string;
+    }): string | any[];
     set alias(value: any);
     get alias(): any;
     set port(value: any);