pmcf 6.1.3 → 6.1.5

package/README.md

@@ -77,26 +77,26 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-13)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-14)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-15)
+        *   [Parameters](#parameters-14)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-16)
+        *   [Parameters](#parameters-15)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-17)
+    *   [Parameters](#parameters-16)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-18)
+    *   [Parameters](#parameters-17)
 *   [cidrAddresses](#cidraddresses)
-    *   [Parameters](#parameters-19)
+    *   [Parameters](#parameters-18)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-19)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
@@ -286,18 +286,6 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 *   `directory`   (optional, default `"/"`)
 
-## SkeletonNetworkInterface
-
-**Extends ServiceOwner**
-
-### networkAddresses
-
-#### Parameters
-
-*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
-
-Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
-
 ## SystemdJournalRemoteService
 
 **Extends CoreService**
@@ -373,6 +361,18 @@ Returns **Iterable<[string](https://developer.mozilla.org/docs/Web/JavaScript/Re
 
 Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
 
+## SkeletonNetworkInterface
+
+**Extends ServiceOwner**
+
+### networkAddresses
+
+#### Parameters
+
+*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
+
+Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
+
 ## families
 
 Returns **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.1.3",
+  "version": "6.1.5",
   "publishConfig": {
     "access": "public"
   },
@@ -52,7 +52,7 @@
   "dependencies": {
     "aggregated-map": "^1.0.7",
     "content-entry-transform": "^1.6.9",
-    "ip-utilties": "^3.3.0",
+    "ip-utilties": "^3.4.0",
     "npm-pkgbuild": "^20.7.12",
     "pacc": "^10.4.0",
     "package-directory": "^8.2.0"

package/src/base.mjs

@@ -169,7 +169,6 @@ export class Base {
                 );
                 all.push(value); // TODO should not happen
               } else if (typeof value === "object") {
-                //console.log("NO F", this.fullName, path, value);
                 all.push(...Object.values(value));
               }
             }

package/src/cluster.mjs

@@ -91,7 +91,8 @@ export class Cluster extends Host {
       for (const cluster of [...this.owner.clusters].sort((a, b) =>
         a.name.localeCompare(b.name)
       )) {
-        cfg.push(`vrrp_instance ${cluster.name} {`);
+        const name = cluster.name;
+        cfg.push(`vrrp_instance ${name} {`);
         cfg.push(
           `  state ${cluster.masters.indexOf(ni) === 0 ? "MASTER" : "BACKUP"}`
         );
@@ -108,7 +109,7 @@ export class Cluster extends Host {
             } {`
           );
           cfg.push(
-            `    ${na.cidrAddress} dev ${ni.name} label ${cluster.name}`
+            `    ${na.cidrAddress} dev ${ni.name} label ${name}`
           );
           cfg.push("  }");
         }
@@ -120,7 +121,7 @@ export class Cluster extends Host {
           reducedPrio = cluster.backups.indexOf(ni) + 5;
         }
 
-        const credential = cluster.name.toUpperCase() + "_PASSWORD";
+        const credential = name.toUpperCase() + "_PASSWORD";
         credentials.push(credential);
         cfg.push(`  priority ${host.priority - reducedPrio}`);
         cfg.push("  smtp_alert");
@@ -131,9 +132,9 @@ export class Cluster extends Host {
         cfg.push("  }");
 
         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"`
+          `  notify_master "/usr/bin/systemctl start ${name}-master.target"`,
+          `  notify_backup "/usr/bin/systemctl start ${name}-backup.target"`,
+          `  notify_fault "/usr/bin/systemctl start ${name}-fault.target"`
         );
 
         cfg.push("}", "");
@@ -188,33 +189,33 @@ export class Cluster extends Host {
         }
         await writeLines(
           join(packageStagingDir, "/usr/lib/systemd/system"),
-          `${cluster.name}-master.target`,
+          `${name}-master.target`,
           [
             "[Unit]",
-            `Description=master state of cluster ${cluster.name}`,
+            `Description=master state of cluster ${name}`,
             "PartOf=keepalived.service",
-            `Conflicts=${cluster.name}-backup.target ${cluster.name}-fault.target`
+            `Conflicts=${name}-backup.target ${name}-fault.target`
           ]
         );
 
         await writeLines(
           join(packageStagingDir, "/usr/lib/systemd/system"),
-          `${cluster.name}-backup.target`,
+          `${name}-backup.target`,
           [
             "[Unit]",
-            `Description=backup state of cluster ${cluster.name}`,
+            `Description=backup state of cluster ${name}`,
             "PartOf=keepalived.service",
-            `Conflicts=${cluster.name}-master.target ${cluster.name}-fault.target`
+            `Conflicts=${name}-master.target ${name}-fault.target`
           ]
         );
 
         await writeLines(
           join(packageStagingDir, "/usr/lib/systemd/system"),
-          `${cluster.name}-fault.target`,
+          `${name}-fault.target`,
           [
             "[Unit]",
-            `Description=fault state of cluster ${cluster.name}`,
-            `Conflicts=${cluster.name}-master.target ${cluster.name}-backup.target`
+            `Description=fault state of cluster ${name}`,
+            `Conflicts=${name}-master.target ${name}-backup.target`
           ]
         );
 

package/src/services/openldap.mjs

@@ -40,10 +40,6 @@ export class openldap extends CoreService {
 
     const packageData = this.packageData;
 
-    /*console.log(
-      [...this.walkDirections(["this", "extends"])].map(n => n.fullName)
-    );*/
-
     packageData.sources = await Array.fromAsync(
       this.templateContent(
         {

package/src/type.mjs

@@ -42,7 +42,6 @@ export function assign(attribute, object, value) {
     if (attribute.collection) {
       const current = object[attribute.name];
 
-      //console.log("ASSIGN", object.fullName, attribute.name, value.name);
       if (current) {
         if (typeof current.set === "function") {
           if (attribute.type.primitive) {