pmcf 2.71.6 → 2.71.8

package/package.json

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

package/src/cluster.mjs

@@ -127,7 +127,7 @@ export class Cluster extends Host {
         cfg.push(`  virtual_router_id ${cluster.routerId}`);
 
         let reducedPrio = cluster.masters.indexOf(ni);
-        if(reducedPrio < 0) {
+        if (reducedPrio < 0) {
           reducedPrio = cluster.backups.indexOf(ni) + 5;
         }
 
@@ -193,6 +193,37 @@ export class Cluster extends Host {
           cfg.push("}", "");
           break; // only one for now
         }
+        await writeLines(
+          join(packageStagingDir, "/usr/lib/systemd/system"),
+          `${cluster.name}-master.target`,
+          [
+            "[Unit]",
+            `Description=master state of cluster ${cluster.name}`,
+            "PartOf=keepalived.service",
+            `Conflicts=${cluster.name}-fault.target`
+          ]
+        );
+
+        await writeLines(
+          join(packageStagingDir, "/usr/lib/systemd/system"),
+          `${cluster.name}-backup.target`,
+          [
+            "[Unit]",
+            `Description=backup state of cluster ${cluster.name}`,
+            "PartOf=keepalived.service",
+            `Conflicts=${cluster.name}-fault.target`
+          ]
+        );
+
+        await writeLines(
+          join(packageStagingDir, "/usr/lib/systemd/system"),
+          `${cluster.name}-fault.target`,
+          [
+            "[Unit]",
+            `Description=fault state of cluster ${cluster.name}`,
+            `Conflicts=${cluster.name}-master.target ${cluster.name}-backup.target`
+          ]
+        );
       }
 
       await writeLines(
@@ -201,38 +232,6 @@ export class Cluster extends Host {
         cfg
       );
 
-      await writeLines(
-        join(packageStagingDir, "/usr/lib/systemd/system"),
-        `${this.name}-master.target`,
-        [
-          "[Unit]",
-          `Description=master state of cluster ${this.name}`,
-          "PartOf=keepalived.service",
-          `Conflicts=${this.name}-fault.target`
-        ]
-      );
-
-      await writeLines(
-        join(packageStagingDir, "/usr/lib/systemd/system"),
-        `${this.name}-backup.target`,
-        [
-          "[Unit]",
-          `Description=backup state of cluster ${this.name}`,
-          "PartOf=keepalived.service",
-          `Conflicts=${this.name}-fault.target`
-        ]
-      );
-
-      await writeLines(
-        join(packageStagingDir, "/usr/lib/systemd/system"),
-        `${this.name}-fault.target`,
-        [
-          "[Unit]",
-          `Description=fault state of cluster ${this.name}`,
-          `Conflicts=${this.name}-master.target ${this.name}-backup.target`
-        ]
-      );
-
       yield result;
     }
   }

package/src/services/bind.mjs

@@ -152,6 +152,7 @@ export class BindService extends ExtraSourceService {
   constructor(owner, data) {
     super(owner, data);
 
+    this._systemd = "bind.service";
     this._extends.push(new Service(owner, { name: this.name, type: "dns" }));
     this.views = {};
 

package/src/services/chrony.mjs

@@ -34,7 +34,7 @@ const ChronyServiceTypeDefinition = {
           },
           {
             family: "unix",
-            path: "/run/chrony/chronyd.sock"
+            path: "/var/run/chrony/chronyd.sock"
           }
         ]
       }
@@ -54,6 +54,8 @@ export class ChronyService extends ExtraSourceService {
   constructor(owner, data) {
     super(owner, data);
     this.read(data, ChronyServiceTypeDefinition);
+
+    this._systemd = "chronyd.service";
   }
 
   get type() {

package/src/services/openldap.mjs

@@ -57,6 +57,8 @@ export class OpenLDAPService extends Service {
   constructor(owner, data) {
     super(owner, data);
     this.read(data, OpenLDAPServiceTypeDefinition);
+
+    this._systemd = "slapd.service";
   }
 
   get type() {

package/types/services/bind.d.mts

@@ -400,6 +400,7 @@ export class BindService extends ExtraSourceService {
     retry: number;
     expire: number;
     minimum: number;
+    _systemd: string;
     views: {};
     get soaUpdates(): number[];
     set addresses(value: any[]);

package/types/services/chrony.d.mts

@@ -285,6 +285,7 @@ export class ChronyService extends ExtraSourceService {
             };
         };
     };
+    _systemd: string;
     preparePackages(dir: any): AsyncGenerator<{
         dir: any;
         sources: FileContentProvider[];

package/types/services/openldap.d.mts

@@ -282,6 +282,7 @@ export class OpenLDAPService extends Service {
     };
     _baseDN: any;
     _rootDN: any;
+    _systemd: string;
     get type(): string;
     set baseDN(value: any);
     get baseDN(): any;