pmcf 2.71.7 → 2.71.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.71.7",
+  "version": "2.71.9",
   "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/service.mjs

@@ -167,16 +167,15 @@ export class Service extends Base {
             } else {
               if (e.family === na.family) {
                 result.push(new Endpoint(this, na, options));
-              } else {
-                if (!domainNames.has(this.domainName)) {
-                  domainNames.add(this.domainName);
-                  result.push(
-                    new DomainNameEndpoint(this, this.domainName, options)
-                  );
-                }
               }
             }
           }
+
+          if (!domainNames.has(this.domainName)) {
+            domainNames.add(this.domainName);
+            result.push(new DomainNameEndpoint(this, this.domainName, options));
+          }
+
           break;
       }
     }