pmcf 2.59.6 → 2.60.0

package/package.json

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

package/src/cluster.mjs

@@ -106,15 +106,22 @@ export class Cluster extends Host {
         cfg.push(`  state ${cluster.masters.has(ni) ? "MASTER" : "BACKUP"}`);
         cfg.push(`  interface ${ni.name}`);
 
-        cfg.push("  virtual_ipaddress {");
         for (const na of cluster.networkAddresses(
           na => na.networkInterface.kind !== "loopback"
         )) {
+          cfg.push(
+            `  ${
+              na.family === "IPv4"
+                ? "virtual_ipaddress"
+                : "virtual_ipaddress_excluded"
+            } {`
+          );
           cfg.push(
             `    ${na.cidrAddress} dev ${ni.name} label ${cluster.name}`
           );
+          cfg.push("  }");
         }
-        cfg.push("  }");
+
         cfg.push(`  virtual_router_id ${cluster.routerId}`);
         cfg.push(
           `  priority ${host.priority + (cluster.masters.has(ni) ? 0 : 5)}`
@@ -127,17 +134,12 @@ export class Cluster extends Host {
         cfg.push("  }");
 
         cfg.push(
-          `  notify_master "/usr/bin/systemctl start ${cluster.name}-master.target"`
-        );
-        cfg.push(
-          `  notify_backup "/usr/bin/systemctl start ${cluster.name}-backup.target"`
-        );
-        cfg.push(
+          `  notify_master "/usr/bin/systemctl start ${cluster.name}-master.target"`,
+          `  notify_backup "/usr/bin/systemctl start ${cluster.name}-backup.target"`,
           `  notify_fault "/usr/bin/systemctl start ${cluster.name}-fault.target"`
         );
 
-        cfg.push("}");
-        cfg.push("");
+        cfg.push("}", "");
 
         for (const endpoint of serviceEndpoints(cluster, {
           services: { type: "http" },

package/src/host.mjs

@@ -8,7 +8,8 @@ import {
   domainFromDominName,
   domainName,
   writeLines,
-  sectionLines
+  sectionLines,
+  asArray
 } from "./utils.mjs";
 import { objectFilter } from "./filter.mjs";
 import { addType, types } from "./types.mjs";
@@ -457,7 +458,7 @@ export class Host extends ServiceOwner {
 
     for (const networkInterface of this.networkInterfaces.values()) {
       for (const s of networkInterface.subnets()) {
-        sn.set(s.address,s);
+        sn.set(s.address, s);
       }
     }
 
@@ -514,17 +515,20 @@ export class Host extends ServiceOwner {
     await generateKnownHosts(this.owner.hosts(), join(dir, "root", ".ssh"));
 
     for (const service of this.services) {
-      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`
-        );
+      if (service.systemdConfigs) {
+        for (const {
+          serviceName,
+          configFileName,
+          content
+        } of asArray(service.systemdConfigs(this.name))) {
+          await writeLines(dir, configFileName, sectionLines(...content));
+
+          addHook(
+            packageData.properties.hooks,
+            "post_install",
+            `systemctl enable ${serviceName}`
+          );
+        }
       }
     }
 

package/src/services/systemd-journal-remote.mjs

@@ -32,11 +32,16 @@ export class SystemdJournalRemoteService extends Service {
     return SystemdJournalRemoteServiceTypeDefinition.name;
   }
 
-  systemdConfig(name) {
-    return {
-      serviceName: "systemd-journal-remote",
-      configFileName: `etc/systemd/journal-remote.conf.d/${name}.conf`,
-      content: ["Remote", {}]
-    };
+  systemdConfigs(name) {
+    return [
+      {
+        serviceName: "systemd-journal-remote.service",
+        configFileName: `etc/systemd/journal-remote.conf.d/${name}.conf`,
+        content: ["Remote", {}]
+      } /*,
+      {
+        serviceName: "systemd-journal-remote.socket"
+      }*/
+    ];
   }
 }

package/src/services/systemd-journal-upload.mjs

@@ -34,9 +34,9 @@ export class SystemdJournalUploadService extends Service {
     return SystemdJournalUploadServiceTypeDefinition.name;
   }
 
-  systemdConfig(name) {
+  systemdConfigs(name) {
     return {
-      serviceName: "systemd-journal-upload",
+      serviceName: "systemd-journal-upload.service",
       configFileName: `etc/systemd/journal-upload.conf.d/${name}.conf`,
       content: ["Upload", {
         URL : this.url

package/src/services/systemd-journal.mjs

@@ -32,7 +32,7 @@ export class SystemdJournalService extends Service {
     return SystemdJournalServiceTypeDefinition.name;
   }
 
-  systemdConfig(name) {
+  systemdConfigs(name) {
     return {
       serviceName: "systemd-journald",  
       configFileName: `etc/systemd/journal.conf.d/${name}.conf`,

package/src/services/systemd-resolved.mjs

@@ -36,7 +36,7 @@ export class SystemdResolvedService extends ExtraSourceService {
     return SystemdResolvedServiceTypeDefinition.name;
   }
 
-  systemdConfig(name) {
+  systemdConfigs(name) {
     const options = (priority, limit) => {
       return {
         services: { type: "dns", priority },
@@ -48,7 +48,7 @@ export class SystemdResolvedService extends ExtraSourceService {
     };
 
     return {
-      serviceName: "systemd-resolved",
+      serviceName: "systemd-resolved.service",
       configFileName: `etc/systemd/resolved.conf.d/${name}.conf`,
       content: [
         "Resolve",

package/src/services/systemd-timesyncd.mjs

@@ -36,9 +36,9 @@ export class SystemdTimesyncdService extends ExtraSourceService {
     return SystemdTimesyncdServiceTypeDefinition.name;
   }
 
-  systemdConfig(name) {
+  systemdConfigs(name) {
     return {
-      serviceName: "systemd-timesyncd",
+      serviceName: "systemd-timesyncd.service",
       configFileName: `etc/systemd/timesyncd.conf.d/${name}.conf`,
       content: [
         "Time",

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

@@ -245,10 +245,10 @@ export class SystemdJournalRemoteService extends Service {
     };
     get type(): string;
     get systemdServices(): string;
-    systemdConfig(name: any): {
+    systemdConfigs(name: any): {
         serviceName: string;
         configFileName: string;
         content: {}[];
-    };
+    }[];
 }
 import { Service } from "pmcf";

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

@@ -251,7 +251,7 @@ export class SystemdJournalUploadService extends Service {
     };
     get type(): string;
     get systemdServices(): string;
-    systemdConfig(name: any): {
+    systemdConfigs(name: any): {
         serviceName: string;
         configFileName: string;
         content: (string | {

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

@@ -245,7 +245,7 @@ export class SystemdJournalService extends Service {
     };
     get type(): string;
     get systemdServices(): string;
-    systemdConfig(name: any): {
+    systemdConfigs(name: any): {
         serviceName: string;
         configFileName: string;
         content: (string | {

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

@@ -244,7 +244,7 @@ export class SystemdResolvedService extends ExtraSourceService {
         properties: {};
     };
     get systemdServices(): string;
-    systemdConfig(name: any): {
+    systemdConfigs(name: any): {
         serviceName: string;
         configFileName: string;
         content: (string | {

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

@@ -244,7 +244,7 @@ export class SystemdTimesyncdService extends ExtraSourceService {
         properties: {};
     };
     get systemdServices(): string;
-    systemdConfig(name: any): {
+    systemdConfigs(name: any): {
         serviceName: string;
         configFileName: string;
         content: (string | {