pmcf 4.8.3 → 4.9.1

package/package.json

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

package/src/host-utils.mjs

@@ -21,13 +21,15 @@ export async function generateMachineInfo(host, packageData) {
 
 export async function generateKnownHosts(hosts, dir) {
   const keys = [];
-  for await (const host of hosts) {
+  for (const host of hosts) {
     try {
       const [alg, key, desc] = (await host.publicKey("ed25519")).split(/\s+/);
 
-      keys.push(`${host.domainName} ${alg} ${key}`);
+      for(const domainName of host.domainNames) {
+        keys.push(`${domainName} ${alg} ${key}`);
+      }
 
-      for await (const addr of host.networkAddresses(
+      for (const addr of host.networkAddresses(
         na => na.networkInterface.kind !== "loopback"
       )) {
         keys.push(`${addr.address} ${alg} ${key}`);

package/src/host.mjs

@@ -428,6 +428,7 @@ export class Host extends ServiceOwner {
     let packageData = {
       dir,
       sources: [
+        ...this.templateContent(),
         new FileContentProvider(
           { dir: this.directory, pattern: "*.pub" },
           { destination: "/etc/ssh/", mode: 0o644 }

package/src/services/bind.mjs

@@ -164,7 +164,7 @@ export class BindService extends ExtraSourceService {
 
   constructor(owner, data) {
     super(owner, data);
-  
+
     this.views = {};
 
     for (const name of ["internal", "protected"]) {
@@ -323,8 +323,7 @@ export class BindService extends ExtraSourceService {
     packageData.properties = {
       name: `named-zones-${name}-outfacing`,
       description: `outfacing zone definitions for ${names}`,
-      access: "private",
-      hooks: {}
+      access: "private"
     };
 
     yield* this.generateOutfacingDefs(sources, packageData);
@@ -345,7 +344,7 @@ export class BindService extends ExtraSourceService {
 
     if (outfacingZones.length) {
       addHook(
-        packageData.properties.hooks,
+        packageData,
         "post_upgrade",
         `/usr/bin/named-hostname-update ${outfacingZones
           .map(zone => zone.id)

package/types/host.d.mts

@@ -254,7 +254,7 @@ export class Host extends ServiceOwner {
     publicKey(type?: string): Promise<string>;
     preparePackages(dir: any): AsyncGenerator<{
         dir: any;
-        sources: FileContentProvider[];
+        sources: any[];
         outputs: Set<typeof import("npm-pkgbuild").OCI | typeof import("npm-pkgbuild").DOCKER>;
         properties: {
             name: string;
@@ -269,5 +269,4 @@ export class Host extends ServiceOwner {
     }, void, unknown>;
 }
 import { ServiceOwner } from "pmcf";
-import { FileContentProvider } from "npm-pkgbuild";
 import { Base } from "pmcf";