pmcf 6.59.2 → 6.60.1

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-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)
@@ -308,18 +308,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 +401,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;

package/package.json

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

package/src/common-attributes.mjs

@@ -16,6 +16,7 @@ import {
 import { PROTOCOL_TCP, PROTOCOL_UDP, PROTOCOL_QUIC } from "./constants.mjs";
 
 export const SCOPE_SYSTEMD_NETWORKD = "systemd-networkd";
+export const SCOPE_SYSTEMD_TIMESYNCD = "systemd-timesyncd";
 
 export const networkAddressType = "network|host|network_interface";
 

package/src/core-service.mjs

@@ -1,3 +1,4 @@
+import { join } from "node:path";
 import {
   FAMILY_IPV4,
   FAMILY_IPV6,
@@ -10,7 +11,8 @@ import {
   number_attribute_writable,
   priority_attribute,
   default_collection_attribute_writable,
-  asArray
+  asArray,
+  boolean_attribute_writable_false
 } from "pacc";
 import {
   base,
@@ -20,6 +22,7 @@ import {
   HTTPEndpoint,
   unix_endpoint
 } from "pmcf";
+import { writeLines } from "./utils.mjs";
 import { addType } from "./type.mjs";
 import { FAMILY_UNIX, FAMILY_DNS } from "./constants.mjs";
 import {
@@ -42,6 +45,12 @@ import {
 } from "./dns-utils.mjs";
 
 export class credential extends base {
+  static attributes = {
+    systemdCredential: {
+      ...boolean_attribute_writable_false,
+      name: "systemdCredential"
+    }
+  };
   static {
     addType(this);
   }
@@ -66,7 +75,7 @@ export class CoreService extends base {
   }
   static attributes = {
     ...networkAddressAttributes,
-  //  networkInterfaces: networkInterfaces_attribute,
+    //  networkInterfaces: networkInterfaces_attribute,
 
     ...endpointAttributes,
     extends: {
@@ -93,12 +102,16 @@ export class CoreService extends base {
   _weight;
   _port;
   _systemdService;
-  credentials = new Map();
+  _credentials = new Map();
 
   toString() {
     return `${this.fullName}(${this.type})`;
   }
 
+  get credentials() {
+    return this.mapFromDirections(["this", "extends"], "_credentials")
+  }
+
   get network() {
     return this.owner.network;
   }
@@ -270,6 +283,30 @@ export class CoreService extends base {
     return serviceTypes(ServiceTypes[this.type]);
   }
 
+  async writeSystemdCredentialConfig(dir, name) {
+    let lines = [];
+
+    const seen = new Set();
+
+    for (const [name, cred] of this.credentials) {
+      //console.log(this.fullName,name);
+      if (cred.systemdCredential && !seen.has(name)) {
+        seen.add(name);
+        lines.push(
+          `LoadCredentialEncrypted=${name}:/etc/credstore.encrypted/${name}`
+        );
+      }
+    }
+
+    if (lines.length) {
+      await writeLines(
+        join(dir, `etc/systemd/system/${name}.service.d`),
+        `credentials.conf`,
+        lines
+      );
+    }
+  }
+
   get systemdService() {
     return (
       this.attribute("_systemdService") ??

package/src/services/alpm.mjs

@@ -4,8 +4,10 @@ import {
   string_attribute_writable,
   string_set_attribute_writable
 } from "pacc";
-import { addType, CoreService, base } from "pmcf";
+import { base } from "../base.mjs";
+import { CoreService } from "../core-service.mjs";
 import { owner_attribute } from "../common-attributes.mjs";
+import { addType } from "../type.mjs";
 
 class alpm_repository extends base {
   static attributes = {

package/src/services/kea.mjs

@@ -404,7 +404,9 @@ export class kea extends CoreService {
 
           if (addr && subnet.matchesAddress(addr)) {
             ip =
-              family === "6" ? { "ip-addresses": [addr] } : { "ip-address": addr };
+              family === "6"
+                ? { "ip-addresses": [addr] }
+                : { "ip-address": addr };
           }
 
           let ids = { "hw-address": k };
@@ -468,6 +470,9 @@ export class kea extends CoreService {
 
     const packageData = await this.preparePackage(dir);
 
+    await this.writeSystemdCredentialConfig(dir, "kea-dhcp4");
+    await this.writeSystemdCredentialConfig(dir, "kea-dhcp6");
+
     for (const [name, data] of Object.entries({
       "kea-dhcp-ddns": ddns,
       "kea-dhcp4": dhcp4,

package/src/services/systemd-timesyncd.mjs

@@ -1,40 +1,46 @@
 import { string_attribute_writable, duration_attribute_writable } from "pacc";
-import { ExtraSourceService, serviceEndpoints, addType } from "pmcf";
-import { filterConfigurable, sectionLines } from "../utils.mjs";
+import { ExtraSourceService, serviceEndpoints } from "pmcf";
+import { sectionLines } from "../utils.mjs";
+import { SCOPE_SYSTEMD_TIMESYNCD } from "../common-attributes.mjs";
+import { addType } from "../type.mjs";
 
 export class SystemdTimesyncdService extends ExtraSourceService {
   static name = "systemd-timesyncd";
   static attributes = {
-    NTP: { ...string_attribute_writable, name: "NTP", configurable: true },
+    NTP: {
+      ...string_attribute_writable,
+      name: "NTP",
+      scope: SCOPE_SYSTEMD_TIMESYNCD
+    },
     FallbackNTP: {
       ...string_attribute_writable,
       name: "FallbackNTP",
-      configurable: true
+      scope: SCOPE_SYSTEMD_TIMESYNCD
     },
     RootDistanceMaxSec: {
       ...duration_attribute_writable,
       name: "RootDistanceMaxSec",
-      configurable: true
+      scope: SCOPE_SYSTEMD_TIMESYNCD
     },
     PollIntervalMinSec: {
       ...duration_attribute_writable,
       name: "PollIntervalMinSec",
-      configurable: true
+      scope: SCOPE_SYSTEMD_TIMESYNCD
     },
     PollIntervalMaxSec: {
       ...duration_attribute_writable,
       name: "PollIntervalMaxSec",
-      configurable: true
+      scope: SCOPE_SYSTEMD_TIMESYNCD
     },
     ConnectionRetrySec: {
       ...duration_attribute_writable,
       name: "ConnectionRetrySec",
-      configurable: true
+      scope: SCOPE_SYSTEMD_TIMESYNCD
     },
     SaveIntervalSec: {
       ...duration_attribute_writable,
       name: "SaveIntervalSec",
-      configurable: true
+      scope: SCOPE_SYSTEMD_TIMESYNCD
     }
   };
   static service = {
@@ -63,7 +69,9 @@ export class SystemdTimesyncdService extends ExtraSourceService {
       content: sectionLines("Time", {
         NTP: serviceEndpoints(this, options(300, 399)),
         FallbackNTP: serviceEndpoints(this, options(100, 199)),
-        ...this.getAttributes(filterConfigurable)
+        ...this.getAttributes(
+          attribute => attribute.scope === SCOPE_SYSTEMD_TIMESYNCD
+        )
       })
     };
   }