pmcf 2.10.4 → 2.11.1

package/bin/pmcf-package

@@ -43,7 +43,7 @@ for (const name of args) {
       const output = new outputFactory(properties);
 
       const artifact = await output.create(
-        sources,
+        sources.map(source=>source[Symbol.asyncIterator]()),
         [],
         publishingDetails,
         options

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.10.4",
+  "version": "2.11.1",
   "publishConfig": {
     "access": "public"
   },
@@ -38,7 +38,7 @@
     "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target es2024 --lib esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "dependencies": {
-    "npm-pkgbuild": "^18.0.0",
+    "npm-pkgbuild": "^18.0.1",
     "pacc": "^3.3.0",
     "pkg-dir": "^8.0.0"
   },

package/src/host-utils.mjs

@@ -1,5 +1,13 @@
-import { writeFile, mkdir, copyFile, glob, chmod, stat } from "node:fs/promises";
+import {
+  writeFile,
+  mkdir,
+  copyFile,
+  glob,
+  chmod,
+  stat
+} from "node:fs/promises";
 import { join } from "node:path";
+import { FileContentProvider } from "npm-pkgbuild";
 import { writeLines, sectionLines } from "../src/utils.mjs";
 import { addHook } from "./hooks.mjs";
 
@@ -132,24 +140,6 @@ network={
   }
 }
 
-export async function copySshKeys(host, packageData) {
-  const sshDir = join(packageData.dir, "etc", "ssh");
-
-  await mkdir(sshDir, { recursive: true });
-
-  for await (const file of glob("ssh_host_*", { cwd: host.directory })) {
-    const destinationFileName = join(sshDir, file);
-    await copyFile(join(host.directory, file), destinationFileName);
-    await chmod(
-      destinationFileName,
-      destinationFileName.endsWith(".pub") ? 0o644 : 0o600
-    );
-
-    const s = await stat(destinationFileName);
-    console.log(destinationFileName,s.mode)
-  }
-}
-
 export async function generateKnownHosts(hosts, dir) {
   const keys = [];
   for await (const host of hosts) {

package/src/host.mjs

@@ -22,7 +22,6 @@ import { loadHooks } from "./hooks.mjs";
 import {
   generateNetworkDefs,
   generateMachineInfo,
-  copySshKeys,
   generateKnownHosts
 } from "./host-utils.mjs";
 
@@ -450,7 +449,17 @@ export class Host extends Base {
   async *preparePackages(dir) {
     const packageData = {
       dir,
-      sources: [new FileContentProvider(dir + "/")[Symbol.asyncIterator]()],
+      sources: [
+        new FileContentProvider(
+          { base: this.directory, pattern: "*.pub" },
+          { destination: "/etc/ssh/", mode: 0o644 }
+        ),
+        new FileContentProvider(
+          { base: this.directory, pattern: "*_key" },
+          { destination: "/etc/ssh/", mode: 0o600 }
+        ),
+        new FileContentProvider(dir + "/")
+      ],
       outputs: this.outputs,
       properties: {
         name: `${this.typeName}-${this.owner.name}-${this.name}`,
@@ -472,7 +481,6 @@ export class Host extends Base {
 
     await generateNetworkDefs(this, packageData);
     await generateMachineInfo(this, packageData);
-    await copySshKeys(this, packageData);
     await generateKnownHosts(this.owner.hosts(), join(dir, "root", ".ssh"));
 
     yield packageData;
@@ -565,11 +573,11 @@ export class NetworkInterface extends Base {
   }
 
   get rawIPv4Address() {
-    return this.rawAddresses.filter(a=>isIPv4Address(a))[0];
+    return this.rawAddresses.filter(a => isIPv4Address(a))[0];
   }
-  
+
   get rawIPv6Address() {
-    return this.rawAddresses.filter(a=>isIPv6Address(a))[0];
+    return this.rawAddresses.filter(a => isIPv6Address(a))[0];
   }
 
   get rawAddresses() {

package/src/location.mjs

@@ -1,4 +1,3 @@
-import { mkdir, copyFile } from "node:fs/promises";
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import { Owner } from "./owner.mjs";
@@ -49,7 +48,13 @@ export class Location extends Owner {
   async *preparePackages(dir) {
     const packageData = {
       dir,
-      sources: [new FileContentProvider(dir + "/")[Symbol.asyncIterator]()],
+      sources: [
+        new FileContentProvider(dir + "/"),
+        new FileContentProvider(
+          { base: this.directory, pattern: "location.json" },
+          { destination: "/etc/location/location.json" }
+        )
+      ],
       outputs: this.outputs,
       properties: {
         name: `${this.typeName}-${this.name}`,
@@ -87,15 +92,6 @@ export class Location extends Owner {
       sectionLines(...this.findService({ type: "ntp" }).systemdConfig)
     );
 
-    const locationDir = join(dir, "etc", "location");
-
-    await mkdir(locationDir, { recursive: true });
-
-    await copyFile(
-      join(this.directory, "location.json"),
-      join(locationDir, "location.json")
-    );
-
     yield packageData;
   }
 }

package/src/services/dhcp.mjs

@@ -49,7 +49,7 @@ export class DHCPService extends Service {
 
     const packageData = {
       dir,
-      sources: [new FileContentProvider(dir + "/")[Symbol.asyncIterator]()],
+      sources: [new FileContentProvider(dir + "/")],
       outputs: this.outputs,
       properties: {
         name: `kea-${this.location.name}-${host.name}`,

package/src/services/dns.mjs

@@ -27,8 +27,18 @@ const DNSServiceTypeDefinition = {
     trusted: { type: "network", collection: true, writeable: true },
     protected: { type: "network", collection: true, writeable: true },
     open: { type: "network", collection: true, writeable: true },
-    hasSVRRecords: { type: "boolean", collection: false, writeable: true, default: false },
-    hasCatalog: { type: "boolean", collection: false, writeable: true, default: false },
+    hasSVRRecords: {
+      type: "boolean",
+      collection: false,
+      writeable: true,
+      default: false
+    },
+    hasCatalog: {
+      type: "boolean",
+      collection: false,
+      writeable: true,
+      default: false
+    },
     hasLinkLocalAdresses: {
       type: "boolean",
       collection: false,
@@ -36,7 +46,12 @@ const DNSServiceTypeDefinition = {
       default: false
     },
     exclude: { type: "network", collection: true, writeable: true },
-    notify: { type: "boolean", collection: false, writeable: true, default: false },
+    notify: {
+      type: "boolean",
+      collection: false,
+      writeable: true,
+      default: false
+    },
     recordTTL: { type: "string", collection: false, writeable: true },
     serial: { type: "number", collection: false, writeable: true },
     refresh: { type: "string", collection: false, writeable: true },
@@ -162,7 +177,7 @@ export class DNSService extends ExtraSourceService {
     const p1 = join(dir, "p1");
     const packageData = {
       dir: p1,
-      sources: [new FileContentProvider(p1 + "/")[Symbol.asyncIterator]()],
+      sources: [new FileContentProvider(p1 + "/")],
       outputs: this.outputs,
       properties: {
         name: `named-${name}`,
@@ -220,7 +235,7 @@ export class DNSService extends ExtraSourceService {
           owner: "named",
           group: "named"
         }
-      )[Symbol.asyncIterator]()
+      )
     ];
 
     await generateZoneDefs(this, location, packageData);

package/src/services/ntp.mjs

@@ -63,7 +63,7 @@ export class NTPService extends ExtraSourceService {
 
     const packageData = {
       dir,
-      sources: [new FileContentProvider(dir + "/")[Symbol.asyncIterator]()],
+      sources: [new FileContentProvider(dir + "/")],
       outputs: this.outputs,
       properties: {
         name: `chrony-${this.location.name}-${host.name}`,

package/types/host-utils.d.mts

@@ -1,4 +1,3 @@
 export function generateMachineInfo(host: any, packageData: any): Promise<void>;
 export function generateNetworkDefs(host: any, packageData: any): Promise<void>;
-export function copySshKeys(host: any, packageData: any): Promise<void>;
 export function generateKnownHosts(hosts: any, dir: any): Promise<void>;

package/types/host.d.mts

@@ -243,7 +243,7 @@ export class Host extends Base {
     publicKey(type?: string): Promise<string>;
     preparePackages(dir: any): AsyncGenerator<{
         dir: any;
-        sources: AsyncIterable<import("content-entry").ContentEntry>[];
+        sources: FileContentProvider[];
         outputs: Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;
         properties: {
             name: string;
@@ -464,3 +464,4 @@ export class NetworkInterface extends Base {
     get kind(): any;
 }
 import { Base } from "./base.mjs";
+import { FileContentProvider } from "npm-pkgbuild";

package/types/location.d.mts

@@ -277,7 +277,7 @@ export class Location extends Owner {
     get location(): this;
     preparePackages(dir: any): AsyncGenerator<{
         dir: any;
-        sources: AsyncIterable<import("content-entry").ContentEntry>[];
+        sources: FileContentProvider[];
         outputs: Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;
         properties: {
             name: string;
@@ -293,3 +293,4 @@ export class Location extends Owner {
     }, void, unknown>;
 }
 import { Owner } from "./owner.mjs";
+import { FileContentProvider } from "npm-pkgbuild";

package/types/services/dhcp.d.mts

@@ -256,7 +256,7 @@ export class DHCPService extends Service {
     get type(): string;
     preparePackages(dir: any): AsyncGenerator<{
         dir: any;
-        sources: AsyncIterable<import("content-entry").ContentEntry>[];
+        sources: FileContentProvider[];
         outputs: Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;
         properties: {
             name: string;
@@ -267,3 +267,4 @@ export class DHCPService extends Service {
     }, void, unknown>;
 }
 import { Service } from "../service.mjs";
+import { FileContentProvider } from "npm-pkgbuild";

package/types/services/dns.d.mts

@@ -379,7 +379,7 @@ export class DNSService extends ExtraSourceService {
     })[];
     preparePackages(dir: any): AsyncGenerator<{
         dir: string;
-        sources: AsyncIterable<import("content-entry").ContentEntry>[];
+        sources: FileContentProvider[];
         outputs: Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;
         properties: {
             name: string;
@@ -389,3 +389,4 @@ export class DNSService extends ExtraSourceService {
     }, void, unknown>;
 }
 import { ExtraSourceService } from "../extra-source-service.mjs";
+import { FileContentProvider } from "npm-pkgbuild";

package/types/services/ntp.d.mts

@@ -270,7 +270,7 @@ export class NTPService extends ExtraSourceService {
     })[];
     preparePackages(dir: any): AsyncGenerator<{
         dir: any;
-        sources: AsyncIterable<import("content-entry").ContentEntry>[];
+        sources: FileContentProvider[];
         outputs: Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;
         properties: {
             name: string;
@@ -281,3 +281,4 @@ export class NTPService extends ExtraSourceService {
     }, void, unknown>;
 }
 import { ExtraSourceService } from "../extra-source-service.mjs";
+import { FileContentProvider } from "npm-pkgbuild";