pmcf 2.41.1 → 2.42.0

package/package.json

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

package/src/host-utils.mjs

@@ -27,7 +27,9 @@ export async function generateKnownHosts(hosts, dir) {
 
       keys.push(`${host.domainName} ${alg} ${key}`);
 
-      for await (const addr of host.networkAddresses()) {
+      for await (const addr of host.networkAddresses(
+        na => na.networkInterface.kind !== "loopback"
+      )) {
         keys.push(`${addr.address} ${alg} ${key}`);
       }
     } catch {}

package/src/host.mjs

@@ -3,6 +3,7 @@ import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import { ServiceOwner, Base, addresses } from "pmcf";
 import { networkAddressProperties } from "./network-support.mjs";
+import { addHook } from "./hooks.mjs";
 import {
   domainFromDominName,
   domainName,
@@ -461,7 +462,8 @@ export class Host extends ServiceOwner {
           { base: this.directory, pattern: "*_key" },
           { destination: "/etc/ssh/", mode: 0o600 }
         ),
-        new FileContentProvider(dir + "/")
+        new FileContentProvider(dir + "/"),
+        new FileContentProvider(join(this.directory, "extra") + "/")
       ],
       outputs: this.outputs,
       properties: {
@@ -474,6 +476,7 @@ export class Host extends ServiceOwner {
         ],
         provides: [...this.provides],
         replaces: [`mf-${this.hostName}`, ...this.replaces],
+        requires: [],
         backup: "root/.ssh/known_hosts",
         hooks: await loadHooks(
           {},
@@ -490,9 +493,15 @@ export class Host extends ServiceOwner {
     await generateKnownHosts(this.owner.hosts(), join(dir, "root", ".ssh"));
 
     for (const service of this.services) {
-      if (service.systemdConfig) {
-        const { name, content } = service.systemdConfig(this.name);
-        await writeLines(dir, name, sectionLines(...content));
+      if (service.systemdConfig) {  
+        const { serviceName, configFileName, content } = service.systemdConfig(this.name);
+        await writeLines(dir, configFileName, sectionLines(...content));
+
+        addHook(
+          packageData.properties.hooks,
+          "post_install",
+          `systemctl enable ${serviceName}.service`
+        );
       }
     }
 

package/src/network-interfaces/wlan.mjs

@@ -54,6 +54,8 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
     const d = join(packageData.dir, "var/lib/iwd/");
     await mkdir(d, { recursive: true });
 
+    packageData.properties.requires.push("iwd", "impala");
+
     /*
     writeFile(
       join(d, `${this.network.name}.psk`),

package/src/services/systemd-journal.mjs

@@ -34,7 +34,8 @@ export class SystemdJournalService extends Service {
 
   systemdConfig(name) {
     return {
-      name: `etc/systemd/journal.conf.d/${name}.conf`,
+      serviceName: "systemd-journald",  
+      configFileName: `etc/systemd/journal.conf.d/${name}.conf`,
       content: [
         "Journal",
         {

package/src/services/systemd-resolved.mjs

@@ -48,7 +48,8 @@ export class SystemdResolvedService extends ExtraSourceService {
     };
 
     return {
-      name: `etc/systemd/resolved.conf.d/${name}.conf`,
+      serviceName: "systemd-resolved",  
+      configFileName: `etc/systemd/resolved.conf.d/${name}.conf`,
       content: [
         "Resolve",
         {

package/src/services/systemd-timesyncd.mjs

@@ -38,7 +38,8 @@ export class SystemdTimesyncdService extends ExtraSourceService {
 
   systemdConfig(name) {
     return {
-      name: `etc/systemd/timesyncd.conf.d/${name}.conf`,
+      serviceName: "systemd-timesyncd",
+      configFileName: `etc/systemd/timesyncd.conf.d/${name}.conf`,
       content: [
         "Time",
         {

package/types/host.d.mts

@@ -246,6 +246,7 @@ export class Host extends ServiceOwner {
             dependencies: any[];
             provides: any[];
             replaces: any[];
+            requires: any[];
             backup: string;
             hooks: any;
         };

package/types/services/systemd-journal.d.mts

@@ -246,7 +246,8 @@ export class SystemdJournalService extends Service {
     get type(): string;
     get systemdServices(): string;
     systemdConfig(name: any): {
-        name: string;
+        serviceName: string;
+        configFileName: string;
         content: (string | {
             Compress: string;
             SystemMaxUse: string;

package/types/services/systemd-resolved.d.mts

@@ -245,7 +245,8 @@ export class SystemdResolvedService extends ExtraSourceService {
     };
     get systemdServices(): string;
     systemdConfig(name: any): {
-        name: string;
+        serviceName: string;
+        configFileName: string;
         content: (string | {
             DNS: any;
             FallbackDNS: any;

package/types/services/systemd-timesyncd.d.mts

@@ -245,7 +245,8 @@ export class SystemdTimesyncdService extends ExtraSourceService {
     };
     get systemdServices(): string;
     systemdConfig(name: any): {
-        name: string;
+        serviceName: string;
+        configFileName: string;
         content: (string | {
             NTP: any;
         })[];