pmcf 6.35.3 → 6.36.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.35.3",
+  "version": "6.36.1",
   "publishConfig": {
     "access": "public"
   },
@@ -53,7 +53,7 @@
     "aggregated-map": "^1.0.10",
     "content-entry-transform": "^1.7.1",
     "ip-utilties": "^3.13.0",
-    "npm-pkgbuild": "^20.9.1",
+    "npm-pkgbuild": "^20.9.2",
     "pacc": "^11.5.1",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.0"

package/src/services/bind.mjs

@@ -28,7 +28,7 @@ import {
   addType,
   FAMILY_IPV4_IPV6
 } from "pmcf";
-import { yesno, writeLines  } from "../utils.mjs";
+import { yesno, writeLines } from "../utils.mjs";
 import {
   DNSRecord,
   dnsFullName,
@@ -486,6 +486,7 @@ class bind_view extends bind_object {
       this._zoneConfigs = new Map();
       this._zones = new Map();
 
+      const subnets = new Set();
       const hosts = new Set();
       const addresses = new Set();
 
@@ -511,17 +512,31 @@ class bind_view extends bind_object {
               )
             );
 
-            const reverseZone =
-              this.hasReverse &&
-              na.subnet.prefix &&
-              this._zones.getOrInsertComputed(
-                reverseArpa(na.subnet.prefix),
+            let reverseZone;
+
+            if (this.hasReverse && na.subnet.prefix) {
+              let subnet;
+
+              for (const s of subnets) {
+                if (s.isIncluded(na.subnet)) {
+                  subnet = s;
+                }
+              }
+
+              if (!subnet) {
+                subnet = na.subnet;
+                subnets.add(subnet);
+              }
+
+              reverseZone = this._zones.getOrInsertComputed(
+                reverseArpa(subnet.prefix),
                 domain =>
                   this.intoCatalog(
                     new bind_zone(this, domain, config, locationName),
                     locationName
                   )
               );
+            }
 
             if (!hosts.has(host)) {
               hosts.add(host);
@@ -801,7 +816,7 @@ export class bind extends CoreService {
     attr.properties = {
       "usr/share/libalpm/scripts/*": { mode: "0777" },
       "etc/named/**/*": { user: "named", group: "named" },
-      "var/lib/named": { user: "named", group: "named" }
+      "var/lib/named/**/*": { user: "named", group: "named" }
     };
 
     console.log("templateContentAttributes", this.fullName, attr);

package/src/subnet.mjs

@@ -77,6 +77,10 @@ export class Subnet {
     return this.address;
   }
 
+  isIncluded(subnet) {
+    return matchPrefixIP(this.address, this.prefixLength, subnet.address);
+  }
+
   matchesAddress(address) {
     return matchPrefixIP(this.address, this.prefixLength, address);
   }