pmcf 6.54.1 → 6.54.2

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**
@@ -414,6 +402,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.54.1",
+  "version": "6.54.2",
   "publishConfig": {
     "access": "public"
   },

package/src/content.mjs

@@ -289,9 +289,9 @@ export class content extends core {
 
   async preparePackage() {
     const packageData = {
-      fragments: this.fragments,
       sources: [],
       outputs: this.outputs,
+      fragments: this.fragments,
       properties: Object.fromEntries(
         extendingAttributeIterator(
           this.constructor,

package/src/services/kea.mjs

@@ -102,7 +102,7 @@ export class kea extends CoreService {
     systemUserName: "kea",
     systemGroupName: "kea",
     services: {
-      "kea-ddns": {
+      "kea-dhcp-ddns": {
         systemdService: "kea-dhcp-ddns.service",
         endpoints: [
           {
@@ -112,63 +112,75 @@ export class kea extends CoreService {
             protocol: PROTOCOL_TCP,
             tls: false
           }
-        ]
-      },
-      "kea-ha-4": {
-        endpoints: [
-          {
-            family: FAMILY_IPV4,
-            port: 53003,
-            pathname: "/",
-            protocol: PROTOCOL_TCP,
-            tls: false
-          }
-        ]
-      },
-      "kea-ha-6": {
-        endpoints: [
-          {
-            family: FAMILY_IPV6,
-            port: 53004,
-            pathname: "/",
-            protocol: PROTOCOL_TCP,
-            tls: false
+        ],
+        services: {
+          "kea-control-ddns": {
+            endpoints: [
+              {
+                family: FAMILY_UNIX,
+                path: "/run/kea/ctrl-ddns"
+              }
+            ]
           }
-        ]
+        }
       },
-      "kea-control-dhcp4": {
-        endpoints: [
-          {
-            family: FAMILY_UNIX,
-            path: "/run/kea/ctrl-4"
-          }
-          /*{
+      "kea-dhcp4": {
+        systemdService: "kea-dhcp4.service",
+        services: {
+          "kea-ha-4": {
+            endpoints: [
+              {
+                family: FAMILY_IPV4,
+                port: 53003,
+                pathname: "/",
+                protocol: PROTOCOL_TCP,
+                tls: false
+              }
+            ]
+          },
+          "kea-control-dhcp4": {
+            endpoints: [
+              {
+                family: FAMILY_UNIX,
+                path: "/run/kea/ctrl-4"
+              }
+              /*{
             family: FAMILY_IPV4,
             port: 53005,
             pathname: "/"
           }*/
-        ]
-      },
-      "kea-control-dhcp6": {
-        endpoints: [
-          {
-            family: FAMILY_UNIX,
-            path: "/run/kea/ctrl-6"
+            ]
           }
-          /*{
+        }
+      },
+      "kea-dhcp6": {
+        systemdService: "kea-dhcp6.service",
+        services: {
+          "kea-ha-6": {
+            endpoints: [
+              {
+                family: FAMILY_IPV6,
+                port: 53004,
+                pathname: "/",
+                protocol: PROTOCOL_TCP,
+                tls: false
+              }
+            ]
+          },
+          "kea-control-dhcp6": {
+            endpoints: [
+              {
+                family: FAMILY_UNIX,
+                path: "/run/kea/ctrl-6"
+              }
+              /*{
             family: FAMILY_IPV6,
             port: 53005,
             pathname: "/"
           }*/
-        ]
-      },
-      "kea-control-ddns": {
-        endpoints: [
-          {
-            family: FAMILY_UNIX,
-            path: "/run/kea/ctrl-ddns"
+            ]
           }
-        ]
+        }
       }
     }
   };
@@ -319,19 +331,6 @@ export class kea extends CoreService {
       }
     ];
 
-    /*const ctrlAgent = {
-      "Control-agent": {
-        "http-host": ctrlAgentEndpoint.hostname,
-        "http-port": ctrlAgentEndpoint.port,
-        "control-sockets": {
-          dhcp4: toSocket(this.endpoint("kea-control-dhcp4")),
-          dhcp6: toSocket(this.endpoint("kea-control-dhcp6")),
-          d2: toSocket(this.endpoint("kea-control-ddns"))
-        },
-        loggers
-      }
-    };*/
-
     const dnsServersSlot = names =>
       names.map(name => {
         return {
@@ -348,7 +347,7 @@ export class kea extends CoreService {
         };
       });
 
-    const ddnsEndpoint = this.endpoint("kea-ddns");
+    const ddnsEndpoint = this.endpoint("kea-dhcp-ddns");
 
     const ddns = {
       DhcpDdns: {
@@ -405,18 +404,18 @@ 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 };
 
-          if (family == 4) {
+          if (family === "4") {
             const dhcpClientId = networkInterface.dhcpClientId;
             if (dhcpClientId) {
               ids = { "client-id": dhcpClientId };
             }
           }
-          
+
           return {
             ...ids,
             ...ip,