pmcf 4.14.10 → 4.15.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.14.10",
+  "version": "4.15.0",
   "publishConfig": {
     "access": "public"
   },
@@ -64,7 +64,7 @@
     "ava": "^6.4.1",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",
-    "semantic-release": "^25.0.2",
+    "semantic-release": "^25.0.3",
     "typescript": "^5.9.3"
   },
   "engines": {

package/src/host-utils.mjs

@@ -1,32 +1,15 @@
-import { join } from "node:path";
 import { writeLines } from "../src/utils.mjs";
 
-export async function generateMachineInfo(host, packageData) {
-  const etcDir = join(packageData.dir, "etc");
-  await writeLines(
-    etcDir,
-    "machine-info",
-    Object.entries({
-      CHASSIS: host.chassis,
-      DEPLOYMENT: host.deployment,
-      LOCATION: host.location.name,
-      HARDWARE_VENDOR: host.vendor,
-      HARDWARE_MODEL: host.modelName
-    }).map(([k, v]) => `${k}=${v}`)
-  );
-
-  await writeLines(etcDir, "machine-id", host["machine-id"]);
-  await writeLines(etcDir, "hostname", host.hostName);
-}
-
 export async function generateKnownHosts(hosts, dir) {
   const keys = [];
   for (const host of hosts) {
     try {
       const [alg, key, desc] = (await host.publicKey("ed25519")).split(/\s+/);
 
-      for(const domainName of host.domainNames) {
-        keys.push(`${domainName} ${alg} ${key}`);
+      for (const domainName of host.domainNames) {
+        if (domainName !== "localhost") {
+          keys.push(`${domainName} ${alg} ${key}`);
+        }
       }
 
       for (const addr of host.networkAddresses(

package/src/host.mjs

@@ -20,7 +20,7 @@ import {
   asArray
 } from "./utils.mjs";
 import { loadHooks } from "./hooks.mjs";
-import { generateMachineInfo, generateKnownHosts } from "./host-utils.mjs";
+import { generateKnownHosts } from "./host-utils.mjs";
 import { NetworkInterfaceTypeDefinition } from "./network-interfaces/network-interface.mjs";
 
 const HostTypeDefinition = {
@@ -468,7 +468,6 @@ export class Host extends ServiceOwner {
       await writeLines(dir, "etc/vconsole.conf", `KEYMAP=${this.keymap}`);
     }
 
-    await generateMachineInfo(this, packageData);
     await generateKnownHosts(this.owner.hosts(), join(dir, "root", ".ssh"));
 
     for (const service of this.services) {

package/src/utils.mjs

@@ -13,7 +13,7 @@ export function yesno(flag) {
  */
 export function domainName(name, defaultDomain) {
   const dcs = name.split(".");
-  return defaultDomain === undefined || dcs.length > 1
+  return defaultDomain === undefined || dcs.length > 1 || name === "localhost"
     ? name
     : [name, defaultDomain].join(".");
 }

package/types/host-utils.d.mts

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