pmcf 4.8.2 → 4.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.8.2",
+  "version": "4.9.0",
   "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,12 +428,13 @@ export class Host extends ServiceOwner {
     let packageData = {
       dir,
       sources: [
+        ...this.templateContent(),
         new FileContentProvider(
-          { base: this.directory, pattern: "*.pub" },
+          { dir: this.directory, pattern: "*.pub" },
           { destination: "/etc/ssh/", mode: 0o644 }
         ),
         new FileContentProvider(
-          { base: this.directory, pattern: "*_key" },
+          { dir: this.directory, pattern: "*_key" },
           { destination: "/etc/ssh/", mode: 0o600 }
         ),
         new FileContentProvider(dir + "/")

package/src/location.mjs

@@ -44,7 +44,7 @@ export class Location extends Owner {
       sources: [
         new FileContentProvider(dir + "/"),
         new FileContentProvider(
-          { base: this.directory, pattern: "location.json" },
+          { dir: this.directory, pattern: "location.json" },
           { destination: "/etc/location/location.json" }
         )
       ],
@@ -54,8 +54,7 @@ export class Location extends Owner {
         description: `${this.typeName} definitions for ${this.fullName}`,
         access: "private",
         dependencies: { jq: ">=1.8" },
-        provides: ["location", "mf-location"],
-        replaces: [`mf-location-${this.name}`]
+        provides: ["location", "mf-location"]
       }
     };
 

package/src/services/openldap.mjs

@@ -7,7 +7,6 @@ import {
 } from "pacc";
 import { addServiceType } from "pmcf";
 import { ServiceTypeDefinition, Service } from "../service.mjs";
-import { addHook } from "../hooks.mjs";
 
 const OpenLDAPServiceTypeDefinition = {
   name: "openldap",
@@ -84,8 +83,6 @@ export class OpenLDAPService extends Service {
   }
 
   async *preparePackages(dir) {
-    const host = this.host;
-    const name = host.name;
     const owner = "ldap";
     const group = "ldap";
 
@@ -108,25 +105,13 @@ export class OpenLDAPService extends Service {
       ],
       outputs: this.outputs,
       properties: {
-        name: `${this.typeName}-${this.location.name}-${name}`,
-        description: `${this.typeName} definitions for ${this.fullName}@${name}`,
+        name: `${this.typeName}-${this.location.name}-${this.host.name}`,
+        description: `${this.typeName} definitions for ${this.fullName}@${this.host.name}`,
         access: "private",
         dependencies: ["openldap>=2.6.10"]
       }
     };
 
-    addHook(
-      packageData,
-      "post_upgrade",
-      `setfacl -m u:${owner}:r /etc/letsencrypt/archive/*/privkey*.pem`
-    );
-
-    addHook(
-      packageData,
-      "post_install",
-      `setfacl -m u:${owner}:r /etc/letsencrypt/archive/*/privkey*.pem`
-    );
-
     yield packageData;
   }
 }

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";

package/types/location.d.mts

@@ -361,7 +361,6 @@ export class Location extends Owner {
                 jq: string;
             };
             provides: string[];
-            replaces: string[];
         };
     }, void, unknown>;
 }