pmcf 6.0.0 → 6.1.0

package/package.json

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

package/src/cluster.mjs

@@ -56,19 +56,15 @@ export class Cluster extends Host {
     )) {
       const host = ni.host;
       const packageStagingDir = join(stagingDir, host.name);
-      const location = `${this.owner.name}-${host.name}`;
+      const name = `${this.owner.name}-${host.name}`;
 
       const packageData = host.packageData;
       packageData.sources.push(
         new FileContentProvider(packageStagingDir + "/")
       );
-      packageData.properties.name = `keepalived-${location}`;
+      packageData.properties.name = `keepalived-${name}`;
       packageData.properties.description = `${this.typeName} definitions for ${this.fullName}`;
-      packageData.properties.groups.push(
-        "service-config",
-        location,
-        "keepalived"
-      );
+      packageData.properties.groups.push("service-config", name, "keepalived");
 
       const extra = [];
 
@@ -91,6 +87,7 @@ export class Cluster extends Host {
         ""
       ];
 
+      const credentials = [];
       for (const cluster of [...this.owner.clusters].sort((a, b) =>
         a.name.localeCompare(b.name)
       )) {
@@ -123,12 +120,14 @@ export class Cluster extends Host {
           reducedPrio = cluster.backups.indexOf(ni) + 5;
         }
 
+        const credential = cluster.name.toUpperCase() + "_PASSWORD";
+        credentials.push(credential);
         cfg.push(`  priority ${host.priority - reducedPrio}`);
         cfg.push("  smtp_alert");
         cfg.push("  advert_int 5");
         cfg.push("  authentication {");
         cfg.push("    auth_type PASS");
-        cfg.push("    auth_pass pass1234");
+        cfg.push("    auth_pass ${" + credential + "}");
         cfg.push("  }");
 
         cfg.push(
@@ -218,6 +217,18 @@ export class Cluster extends Host {
             `Conflicts=${cluster.name}-master.target ${cluster.name}-backup.target`
           ]
         );
+
+        await writeLines(
+          join(packageStagingDir, "/usr/lib/systemd/system/keepalived.d"),
+          `use-credentials.conf`,
+          [
+            "[Service]",
+            ...credentials.map(
+              c =>
+                `LoadCredentialEncrypted=${c}:/etc/credstore.encrypted/keepalived.password`
+            )
+          ]
+        );
       }
 
       await writeLines(

package/src/network-interfaces/wlan.mjs

@@ -64,7 +64,7 @@ export class wlan extends ethernet {
 
     await writeLines(
       join(dir, "usr/lib/systemd/system/iwd.service.d/"),
-      "pmcf.conf",
+      "credentials.conf",
       [
         sectionLines("Service", {
           LoadCredentialEncrypted: `${secretName}:/etc/credstore.encrypted/${secretName}`

package/src/network-support.mjs

@@ -0,0 +1,62 @@
+import {
+  default_attribute_writable,
+  string_collection_attribute_writable,
+  string_attribute_writable,
+  integer_attribute_writable,
+  hostname_attribute as hostname_attribute_base,
+  boolean_attribute_writable
+} from "pacc";
+
+export const networkAddressType = "network|host|network_interface";
+
+export const networks_attribute = {
+  ...default_attribute_writable,
+  name: "networks",
+  type: "network",
+  collection: true
+};
+
+export const psk_attribute = { ...string_attribute_writable, name: "psk" };
+export const ssid_attribute = { ...string_attribute_writable, name: "ssid" };
+export const hostname_attribute = {
+  ...hostname_attribute_base,
+  name: "hostName",
+  writable: true
+};
+
+export const networkAttributes = {
+  scope: {
+    ...string_attribute_writable,
+    name: "scope",
+    values: ["global", "site", "link", "host"]
+    //  default: "global"
+  },
+  class: {
+    ...string_attribute_writable,
+    name: "class",
+    values: ["10GBASE-T", "1000BASE-T", "100BASE-T", "10BASE-T"]
+  },
+  kind: {
+    ...string_attribute_writable,
+    name: "kind",
+    values: ["loopback", "ethernet", "wlan", "wireguard", "fiber", "dsl"]
+  },
+  ssid: ssid_attribute,
+  psk: psk_attribute,
+  secretName: { ...string_attribute_writable, name: "secretName" },
+  metric: { ...integer_attribute_writable, name: "metric" /*default: 1004*/ },
+  mtu: { ...integer_attribute_writable, name: "mtu", default: 1500 },
+  gateway: { ...default_attribute_writable, name: "gateway", type: "host" },
+  multicastDNS: { ...boolean_attribute_writable, name: "multicastDNS" }
+};
+
+export const networkAddressAttributes = {
+  hostName: hostname_attribute,
+  cidrAddresses: {
+    ...string_collection_attribute_writable,
+    name: "cidrAddresses"
+  },
+  cidrAddress: { ...string_attribute_writable, name: "cidrAddress" },
+  addresses: { ...string_collection_attribute_writable, name: "addresses" },
+  address: { ...string_attribute_writable, name: "address" }
+};

package/src/network.mjs

@@ -1,11 +1,7 @@
 import { AggregatedMap } from "aggregated-map";
-import { addType, assign } from "pmcf";
+import { addType } from "pmcf";
 import { Owner } from "./owner.mjs";
-import {
-  networkAttributes,
-  bridges_attribute,
-  subnets_attribute
-} from "./common-attributes.mjs";
+import { networkAttributes, bridges_attribute } from "./common-attributes.mjs";
 import { Subnet } from "./subnet.mjs";
 
 export class Network extends Owner {
@@ -58,7 +54,7 @@ export class Network extends Owner {
   get subnets() {
     if (!this._subnets.get("fe80::/64")) {
       const linkLocal = new Subnet("fe80::/64");
-      this._subnets.set(linkLocal.address,linkLocal);
+      this._subnets.set(linkLocal.address, linkLocal);
       //assign(subnets_attribute, this, linkLocal);
     }
 
@@ -69,6 +65,13 @@ export class Network extends Owner {
       : super.subnets;
   }
 
+  /**
+   * @return {Set<string>}
+   */
+  get families() {
+    return new Set([...this.subnets.values()].map(subnet => subnet.family));
+  }
+
   set secretName(value) {
     this._secretName = value;
   }

package/src/subnet.mjs

@@ -51,11 +51,6 @@ export class Subnet {
     }
   }
 
-  get children()
-  {
-    return [];
-  }
-
   *_walkDirections(directions, seen) {
   }