pmcf 2.42.0 → 2.44.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.42.0",
+  "version": "2.44.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/host.mjs

@@ -119,6 +119,8 @@ export class Host extends ServiceOwner {
         }
       });
     }
+
+    this.extra = data.extra;
   }
 
   _applyExtends(host) {
@@ -451,7 +453,7 @@ export class Host extends ServiceOwner {
   }
 
   async *preparePackages(dir) {
-    const packageData = {
+    let packageData = {
       dir,
       sources: [
         new FileContentProvider(
@@ -462,8 +464,7 @@ export class Host extends ServiceOwner {
           { base: this.directory, pattern: "*_key" },
           { destination: "/etc/ssh/", mode: 0o600 }
         ),
-        new FileContentProvider(dir + "/"),
-        new FileContentProvider(join(this.directory, "extra") + "/")
+        new FileContentProvider(dir + "/")
       ],
       outputs: this.outputs,
       properties: {
@@ -493,8 +494,10 @@ export class Host extends ServiceOwner {
     await generateKnownHosts(this.owner.hosts(), join(dir, "root", ".ssh"));
 
     for (const service of this.services) {
-      if (service.systemdConfig) {  
-        const { serviceName, configFileName, content } = service.systemdConfig(this.name);
+      if (service.systemdConfig) {
+        const { serviceName, configFileName, content } = service.systemdConfig(
+          this.name
+        );
         await writeLines(dir, configFileName, sectionLines(...content));
 
         addHook(
@@ -506,5 +509,21 @@ export class Host extends ServiceOwner {
     }
 
     yield packageData;
+
+    if (this.extra) {
+      packageData = {
+        dir,
+        sources: [new FileContentProvider(join(this.directory, "extra") + "/")],
+        outputs: this.outputs,
+        properties: {
+          name: `${this.typeName}-extra-${this.owner.name}-${this.name}`,
+          description: `additional files for ${this.fullName}`,
+          access: "private",
+          dependencies: [`${this.typeName}-${this.owner.name}-${this.name}`]
+        }
+      };
+
+      yield packageData;
+    }
   }
 }

package/src/service.mjs

@@ -209,6 +209,17 @@ export class Service extends Base {
     return filter ? result.filter(filter) : result;
   }
 
+  address(options = { select: e => e.address, limit: 1 }) {
+    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 ? res.join(options.join) : res;
+  }
+
   set alias(value) {
     this._alias = value;
   }

package/types/host.d.mts

@@ -185,6 +185,7 @@ export class Host extends ServiceOwner {
     _vendor: any;
     _architecture: any;
     _serial: any;
+    extra: any;
     _applyExtends(host: any): void;
     set serial(value: any);
     get serial(): any;

package/types/service.d.mts

@@ -316,6 +316,10 @@ export class Service extends Base {
     get ipAddressOrDomainName(): any;
     get networks(): Set<any>;
     endpoints(filter: any): any[];
+    address(options?: {
+        select: (e: any) => any;
+        limit: number;
+    }): string | any[];
     set alias(value: any);
     get alias(): any;
     set port(value: any);