pmcf 2.41.2 → 2.43.0

package/package.json

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

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,
@@ -118,6 +119,8 @@ export class Host extends ServiceOwner {
         }
       });
     }
+
+    this.extra = data.extra;
   }
 
   _applyExtends(host) {
@@ -450,7 +453,7 @@ export class Host extends ServiceOwner {
   }
 
   async *preparePackages(dir) {
-    const packageData = {
+    let packageData = {
       dir,
       sources: [
         new FileContentProvider(
@@ -461,8 +464,7 @@ export class Host extends ServiceOwner {
           { base: this.directory, pattern: "*_key" },
           { destination: "/etc/ssh/", mode: 0o600 }
         ),
-        new FileContentProvider(dir + "/"),
-        new FileContentProvider(join(this.directory, "extra") + "/")
+        new FileContentProvider(dir + "/")
       ],
       outputs: this.outputs,
       properties: {
@@ -493,11 +495,35 @@ export class Host extends ServiceOwner {
 
     for (const service of this.services) {
       if (service.systemdConfig) {
-        const { name, content } = service.systemdConfig(this.name);
-        await writeLines(dir, name, sectionLines(...content));
+        const { serviceName, configFileName, content } = service.systemdConfig(
+          this.name
+        );
+        await writeLines(dir, configFileName, sectionLines(...content));
+
+        addHook(
+          packageData.properties.hooks,
+          "post_install",
+          `systemctl enable ${serviceName}.service`
+        );
       }
     }
 
     yield packageData;
+
+    if (this.extra) {
+      packageData = {
+        dir,
+        sources: [new FileContentProvider(join(this.directory, "extra") + "/")],
+        outputs: this.outputs,
+        properties: {
+          name: `${this.typeName}-extra-${this.owner.name}-${this.name}`,
+          description: `additional files for ${this.fullName}`,
+          access: "private",
+          dependencies: [`${this.typeName}-${this.owner.name}-${this.name}`]
+        }
+      };
+
+      yield packageData;
+    }
   }
 }

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

@@ -185,6 +185,7 @@ export class Host extends ServiceOwner {
     _vendor: any;
     _architecture: any;
     _serial: any;
+    extra: any;
     _applyExtends(host: any): void;
     set serial(value: any);
     get serial(): 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;
         })[];