pmcf 6.7.2 → 6.7.4

package/README.md

@@ -77,26 +77,26 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-13)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-14)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-15)
+        *   [Parameters](#parameters-14)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-16)
+        *   [Parameters](#parameters-15)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-17)
+    *   [Parameters](#parameters-16)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-18)
+    *   [Parameters](#parameters-17)
 *   [cidrAddresses](#cidraddresses)
-    *   [Parameters](#parameters-19)
+    *   [Parameters](#parameters-18)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-19)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
@@ -286,18 +286,6 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 *   `directory`   (optional, default `"/"`)
 
-## SkeletonNetworkInterface
-
-**Extends ServiceOwner**
-
-### networkAddresses
-
-#### Parameters
-
-*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
-
-Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
-
 ## SystemdJournalRemoteService
 
 **Extends CoreService**
@@ -373,6 +361,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 ServiceOwner**
+
+### 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.7.2",
+  "version": "6.7.4",
   "publishConfig": {
     "access": "public"
   },
@@ -52,7 +52,7 @@
   "dependencies": {
     "aggregated-map": "^1.0.7",
     "content-entry-transform": "^1.6.9",
-    "ip-utilties": "^3.6.0",
+    "ip-utilties": "^3.6.2",
     "npm-pkgbuild": "^20.8.1",
     "pacc": "^10.4.1",
     "package-directory": "^8.2.0",
@@ -63,7 +63,7 @@
     "ava": "^8.0.1",
     "c8": "^11.0.0",
     "documentation": "^14.0.3",
-    "semantic-release": "^25.0.6"
+    "semantic-release": "^25.0.7"
   },
   "overrides": {
     "c8": {

package/src/owner.mjs

@@ -127,18 +127,18 @@ export class Owner extends ServiceOwner {
       return assign(subnets_attribute, this, address);
     }
 
-    const { cidr, prefixLength } = normalizeCIDR(address);
-
-    if (cidr && prefixLength !== 0) {
-      return (
-        this._subnets.get(cidr) ||
-        assign(subnets_attribute, this, new Subnet(cidr))
-      );
-    }
-
     let subnet = this.subnetForAddress(address);
 
     if (!subnet) {
+      const { cidr, prefixLength } = normalizeCIDR(address);
+
+      if (cidr && prefixLength !== 0) {
+        return (
+          this._subnets.get(cidr) ||
+          assign(subnets_attribute, this, new Subnet(cidr))
+        );
+      }
+
       subnet =
         familyIP(address) === FAMILY_IPV4
           ? SUBNET_GLOBAL_IPV4

package/src/services/chrony.mjs

@@ -40,6 +40,7 @@ export class chrony extends ExtraSourceService {
     const packageData = this.packageData;
     packageData.sources.push(new FileContentProvider(dir + "/"));
 
+    const subnets = [...new Set([...this.subnets.values()])]; // TODO should be normal
     const host = this.host;
 
     const lines = [
@@ -75,9 +76,9 @@ export class chrony extends ExtraSourceService {
       "ntsdumpdir /var/lib/chrony",
       "dumpdir /var/lib/chrony",
       "pidfile /run/chrony/chronyd.pid",
-      [...this.subnets.values()].map(s => `allow ${s.address}`),
+      subnets.map(s => `allow ${s.address}`),
       "cmdratelimit interval -4 burst 16",
-      [...this.subnets.values()].map(s => `cmdallow ${s.address}`)
+      subnets.map(s => `cmdallow ${s.address}`)
     ];
 
     await writeLines(join(dir, "etc"), "chrony.conf", lines);