pmcf 6.22.1 → 6.22.3

package/README.md

@@ -78,30 +78,30 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-14)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-15)
 *   [zones](#zones)
 *   [type](#type)
 *   [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)
@@ -296,18 +296,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;
-
 ## zones
 
 Type: [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)\<bind\_zone>
@@ -404,6 +392,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.22.1",
+  "version": "6.22.3",
   "publishConfig": {
     "access": "public"
   },

package/src/core-service.mjs

@@ -3,10 +3,8 @@ import {
   string_attribute_writable,
   number_attribute_writable,
   string_set_attribute,
-  default_collection_attribute_writable,
   boolean_attribute_false,
   port_attribute_writable,
-  type_attribute_writable,
   priority_attribute
 } from "pacc";
 import {
@@ -45,7 +43,6 @@ export const endpointAttributes = {
     name: "protocol",
     values: new Set(["tcp", "udp", "quic"])
   },
-  type: type_attribute_writable,
   types: { ...string_set_attribute, name: "types" },
   tls: { ...boolean_attribute_false, name: "tls" }
 };

package/src/services/bind.mjs

@@ -46,7 +46,11 @@ class bind_zone extends Base {
   static attributes = {
     id: { ...name_attribute, name: "id" },
     file: { ...string_attribute, name: "file" },
-    records: { ...string_attribute_writable, collection: true, name: "records" },
+    records: {
+      ...string_attribute_writable,
+      collection: true,
+      name: "records"
+    },
     foreign: { ...boolean_attribute, name: "foreign" }
   };
 
@@ -138,7 +142,9 @@ class bind_zone_config extends Base {
     const dir = outputControl.dir;
     const group = this.owner;
 
-    console.log(`config: ${group.name}/${this.name}${this.foreign ? " foreign" : ""}`);
+    console.log(
+      `config: ${group.name}/${this.name}${this.foreign ? " foreign" : ""}`
+    );
 
     const content = [];
 
@@ -394,14 +400,16 @@ class bind_group extends Base {
               )
             );
 
-            const reverseZone = this._zones.getOrInsertComputed(
-              reverseArpa(na.subnet.prefix),
-              domain =>
-                this.intoCatalog(
-                  new bind_zone(this, domain, config, locationName),
-                  locationName
-                )
-            );
+            const reverseZone =
+              this.hasReverse && na.subnet.prefix &&
+              this._zones.getOrInsertComputed(
+                reverseArpa(na.subnet.prefix),
+                domain =>
+                  this.intoCatalog(
+                    new bind_zone(this, domain, config, locationName),
+                    locationName
+                  )
+              );
 
             if (host && !hosts.has(host)) {
               hosts.add(host);
@@ -480,13 +488,15 @@ class bind_group extends Base {
                   )
                 );
 
-                reverseZone.records.add(
-                  DNSRecord(
-                    dnsFullName(reverseArpa(address)),
-                    "PTR",
-                    dnsFullName(domainName)
-                  )
-                );
+                if (reverseZone) {
+                  reverseZone.records.add(
+                    DNSRecord(
+                      dnsFullName(reverseArpa(address)),
+                      "PTR",
+                      dnsFullName(domainName)
+                    )
+                  );
+                }
               }
             }
           }