pmcf 2.17.1 → 2.18.1

package/package.json

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

package/src/ip.mjs

@@ -230,18 +230,9 @@ export function rangeIP(address, prefix, lowerAdd = 0, upperReduce = 0) {
   const definition = isIPv4(address) ? ipv4 : ipv6;
 
   const from = _prefix(definition, address, prefix);
-  const to = _encode(definition, from); // /*from ||*/ definition.mask >> BigInt(prefix);
-
-  for (
-    let i = prefix / definition.segmentLength;
-    i < definition.segments;
-    i++
-  ) {
-    to[i] = 0xffff;
-  }
+  const to = from | ((1n << BigInt(definition.bitLength - prefix)) - 1n);
 
-  //console.log(from, to);
-  return [_encode(definition, from + BigInt(lowerAdd)), to];
+  return [_encode(definition, from + BigInt(lowerAdd)), _encode(definition, to - BigInt(upperReduce))];
 }
 
 export function normalizeCIDR(address) {

package/src/services/dns.mjs

@@ -272,12 +272,6 @@ async function generateZoneDefs(dns, location, packageData) {
         records: new Set([SOARecord, NSRecord])
       };
 
-      addHook(
-        packageData.properties.hooks,
-        "post_upgrade",
-        `rm -f /var/lib/named/${zone.file}.jnl`
-      );
-
       const config = {
         name: `${domain}.zone.conf`,
         zones: [zone]
@@ -296,11 +290,17 @@ async function generateZoneDefs(dns, location, packageData) {
     }
   }
 
-  if (configs.length > 0) {
+  const foreignZones = configs.map(c => c.zones).flat();
+
+  if (foreignZones.length) {
     addHook(
       packageData.properties.hooks,
       "post_upgrade",
-      "systemctl try-reload-or-restart named"
+      `rm -f ${foreignZones.map(zone => `/var/lib/named/${zone.file}.jnl`)}\n` +
+        "systemctl try-reload-or-restart named\n" +
+        `/usr/bin/named-hostname-info ${foreignZones
+          .map(zone => zone.id)
+          .join(" ")}|/usr/bin/named-hostname-update`
     );
   }
 

package/src/subnet.mjs

@@ -68,7 +68,7 @@ export class Subnet extends Base {
   }
 
   get addressRange() {
-    return rangeIP(this.prefix, this.prefixLength, 0, 0).map(a => decodeIP(a));
+    return rangeIP(this.prefix, this.prefixLength, 1, 1).map(a => decodeIP(a));
   }
 
   get address() {