pmcf 6.60.10 → 6.60.12

package/README.md

@@ -81,33 +81,32 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-14)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-15)
 *   [Interface](#interface)
 *   [zones](#zones)
 *   [addressesStatement](#addressesstatement)
-    *   [Parameters](#parameters-16)
+    *   [Parameters](#parameters-15)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-17)
+        *   [Parameters](#parameters-16)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-18)
+        *   [Parameters](#parameters-17)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-19)
+    *   [Parameters](#parameters-18)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-20)
+    *   [Parameters](#parameters-19)
 *   [cidrAddresses](#cidraddresses)
-    *   [Parameters](#parameters-21)
+    *   [Parameters](#parameters-20)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-21)
 *   [families](#families)
 *   [secretName](#secretname)
-*   [directHosts](#directhosts)
 *   [subnetForAddress](#subnetforaddress)
     *   [Parameters](#parameters-22)
 *   [ServiceType](#servicetype)
@@ -308,18 +307,6 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 *   `directory`   (optional, default `"/"`)
 
-## SkeletonNetworkInterface
-
-**Extends Interface**
-
-### networkAddresses
-
-#### Parameters
-
-*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
-
-Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
-
 ## Interface
 
 **Extends ServiceOwner**
@@ -413,6 +400,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 Interface**
+
+### 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;
@@ -421,10 +420,6 @@ Returns **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Glob
 
 Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
 
-## directHosts
-
-hosts we own direcly.
-
 ## subnetForAddress
 
 ### Parameters

package/package.json

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

package/src/core-service.mjs

@@ -45,12 +45,6 @@ import {
 } from "./dns-utils.mjs";
 
 export class credential extends base {
-  static attributes = {
-    systemdCredential: {
-      ...boolean_attribute_writable_false,
-      name: "systemdCredential"
-    }
-  };
   static {
     addType(this);
   }
@@ -289,7 +283,7 @@ export class CoreService extends base {
     const seen = new Set();
 
     for (const [name, cred] of this.credentials) {
-      if (cred.systemdCredential && !seen.has(name)) {
+      if (cred.tags.has(name) && !seen.has(name)) {
         seen.add(name);
         lines.push(
           `LoadCredentialEncrypted=${name}:/etc/credstore.encrypted/${name}`

package/src/host.mjs

@@ -6,6 +6,7 @@ import {
   string_attribute_writable,
   number_attribute_writable,
   priority_attribute,
+  enum_string_attribute_writable,
   asArray
 } from "pacc";
 import { cidrAddresses, addresses, addType, assign } from "pmcf";
@@ -26,14 +27,14 @@ export class host extends ServiceOwner {
     ...networkAddressAttributes,
     networkInterfaces: networkInterfaces_attribute,
     os: {
-      ...string_attribute_writable,
+      ...enum_string_attribute_writable,
       name: "os",
       values: new Set(["osx", "windows", "linux"])
     },
     id: { ...string_attribute_writable, name: "id" },
     distribution: { ...string_attribute_writable, name: "distribution" },
     deployment: {
-      ...string_attribute_writable,
+      ...enum_string_attribute_writable,
       name: "deployment",
       values: new Set(["production", "development"])
     },
@@ -43,7 +44,7 @@ export class host extends ServiceOwner {
     vendor: { ...string_attribute_writable, name: "vendor" },
     keymap: { ...string_attribute_writable, name: "keymap" },
     chassis: {
-      ...string_attribute_writable,
+      ...enum_string_attribute_writable,
       name: "chassis",
       values: new Set([
         "phone",
@@ -62,7 +63,7 @@ export class host extends ServiceOwner {
       ])
     },
     architecture: {
-      ...string_attribute_writable,
+      ...enum_string_attribute_writable,
       name: "architecture",
       values: new Set(["x86", "x86_64", "aarch64", "armv7", "riscv"])
     },

package/src/services/kea.mjs

@@ -470,8 +470,13 @@ export class kea extends CoreService {
 
     const packageData = await this.preparePackage(dir);
 
+    asArray(this.keys).forEach(key => {
+      this.credentials.set(key.name, new credential(this,{name: key.name, algorithm: key.algorithm}))
+    });
+
     await this.writeSystemdCredentialConfig(dir, "kea-dhcp4.service");
     await this.writeSystemdCredentialConfig(dir, "kea-dhcp6.service");
+    await this.writeSystemdCredentialConfig(dir, "kea-dhcp-ddns.service");
 
     for (const [name, data] of Object.entries({
       "kea-dhcp-ddns": ddns,

package/src/utils.mjs

@@ -1,5 +1,6 @@
 import { writeFile, mkdir } from "node:fs/promises";
 import { join, dirname, basename } from "node:path";
+import { leafValues } from "pacc";
 
 export function yesno(flag) {
   return flag ? "yes" : "no";
@@ -36,17 +37,12 @@ export function domainFromDominName(domainName, defaultDomain) {
 }
 
 export async function writeLines(dir, name, ...lines) {
-  const data = lines
-        .flat()
-        .filter(line => line !== undefined)
-        .map(l => l + "\n")
-        .join("");
-  
   const full = join(dir, name);
   dir = dirname(full);
   name = basename(full);
   await mkdir(dir, { recursive: true });
 
+  const data = [...leafValues(lines)].map(l => l + "\n").join("");
   return writeFile(join(dir, name), data, "utf8");
 }