pmcf 6.60.13 → 6.61.0

package/README.md

@@ -81,30 +81,30 @@ 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-15)
+    *   [Parameters](#parameters-16)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-16)
+        *   [Parameters](#parameters-17)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-17)
+        *   [Parameters](#parameters-18)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-18)
+    *   [Parameters](#parameters-19)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-19)
-*   [cidrAddresses](#cidraddresses)
     *   [Parameters](#parameters-20)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-21)
+*   [cidrAddresses](#cidraddresses)
+    *   [Parameters](#parameters-21)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [subnetForAddress](#subnetforaddress)
@@ -307,6 +307,18 @@ 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**
@@ -400,18 +412,6 @@ 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;

package/package.json

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

package/src/core-service.mjs

@@ -458,3 +458,7 @@ export function endpointAddresses(entries) {
     )
     .map(e => e.networkAddress.address);
 }
+
+export function systemdCredentialFileName(serviceName, credentialName) {
+  return `/run/credentials/${serviceName}/${credentialName}`;
+}

package/src/services/kea.mjs

@@ -21,7 +21,9 @@ import {
   CoreService,
   Endpoint,
   sortDescendingByPriority,
-  bind_key
+  bind_key,
+  systemdCredentialFileName,
+  credential
 } from "pmcf";
 import { FAMILY_UNIX, PROTOCOL_TCP } from "../constants.mjs";
 import { writeLines } from "../utils.mjs";
@@ -41,6 +43,8 @@ class kea_subnet extends Subnet {
   pool = [];
 }
 
+const SCOPE_KEA = "kea";
+
 export class kea extends CoreService {
   static attributes = {
     subnets: {
@@ -69,31 +73,31 @@ export class kea extends CoreService {
     "ddns-send-updates": {
       ...boolean_attribute_writable_true,
       name: "ddns-send-updates",
-      configurable: true
+      scope: SCOPE_KEA
     },
     "renew-timer": {
       ...number_attribute_writable,
       name: "renew-timer",
-      configurable: true,
+      scope: SCOPE_KEA,
       default: 900
     },
     "rebind-timer": {
       ...number_attribute_writable,
       name: "rebind-timer",
-      configurable: true,
+      scope: SCOPE_KEA,
       default: 1800
     },
     "valid-lifetime": {
       ...number_attribute_writable,
       name: "valid-lifetime",
       mandatory: true,
-      configurable: true,
+      scope: SCOPE_KEA,
       default: 86400
     },
     "ddns-conflict-resolution-mode": {
       ...string_attribute_writable,
       name: "ddns-conflict-resolution-mode",
-      configurable: true
+      scope: SCOPE_KEA
       //values: new Set(["check-exists-with-dhcid","no-check-with-dhcid"])
     }
   };
@@ -191,6 +195,18 @@ export class kea extends CoreService {
 
   subnets = new Map();
 
+  get credentials() {
+    //TODO maybe introduce synthetic extends
+    asArray(this.keys).forEach(key => {
+      const cred = new credential(this);
+      cred.name = `key.${key.name}.tsig`;
+      cred._tags.add("kea-dhcp-ddns.service");
+      this._credentials.set(cred.name, cred);
+    });
+
+    return super.credentials;
+  }
+
   listenInterfaces(family) {
     return this.endpoints(
       endpoint =>
@@ -299,7 +315,8 @@ export class kea extends CoreService {
 
     for (const [path, attribute] of extendingAttributeIterator(
       this.constructor,
-      attribute => attribute.configurable && this[attribute.name] !== undefined
+      attribute =>
+        attribute.scope === SCOPE_KEA && this[attribute.name] !== undefined
     )) {
       const name = path.join(".");
       cfg[name] = this[name];
@@ -358,7 +375,10 @@ export class kea extends CoreService {
           return {
             name: key.name,
             algorithm: key.algorithm,
-            "secret-file": `/run/credentials/kea-dhcp-ddns.service/kea.${key.name}.tsig`
+            "secret-file": systemdCredentialFileName(
+              "kea-dhcp-ddns.service",
+              `key.${key.name}.tsig`
+            )
           };
         }),
         "forward-ddns": {