pmcf 2.62.3 → 2.63.0

package/package.json

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

package/src/base.mjs

@@ -459,12 +459,7 @@ export class Base {
   }
 
   property(name) {
-    const value = this._properties?.[name];
-    if (value === undefined && this.owner) {
-      return this.owner.property(name);
-    }
-
-    return value;
+    return this._properties?.[name] ?? this.owner?.property(name);
   }
 
   expand(object) {
@@ -484,10 +479,7 @@ export class Base {
         }
         if (object instanceof Map) {
           return new Map(
-            [...object].map(([k, v]) => [
-              this.expand(k),
-              this.expand(v)
-            ])
+            [...object].map(([k, v]) => [this.expand(k), this.expand(v)])
           );
         }
 

package/src/services/bind.mjs

@@ -400,6 +400,7 @@ export class BindService extends ExtraSourceService {
           configs.push(catalogConfig);
 
           zone.catalogZone = {
+            catalog: true,
             id: `catalog.${domain}`,
             file: `${locationName}/catalog.${domain}.zone`,
             records: new Set([
@@ -555,6 +556,8 @@ export class BindService extends ExtraSourceService {
       console.log(`config: ${config.name}`);
 
       const content = [];
+      const openContent = [];
+
       for (const zone of config.zones) {
         console.log(`  file: ${zone.file}`);
 
@@ -582,6 +585,14 @@ export class BindService extends ExtraSourceService {
         content.push(`};`);
         content.push("");
 
+        if (!zone.catalog) {
+          openContent.push(
+            `zone \"${zone.id}\" {`,
+            `  in-view protected;`,
+            "}"
+          );
+        }
+
         let maxKeyLength = 0;
         for (const r of zone.records) {
           if (r.key.length > maxKeyLength) {
@@ -603,6 +614,14 @@ export class BindService extends ExtraSourceService {
         config.name,
         content
       );
+
+      if (openContent.length) {
+        await writeLines(
+          join(packageData.dir, "etc/named/open"),
+          config.name,
+          openContent
+        );
+      }
     }
   }
 }