pmcf 6.31.3 → 6.32.0

package/package.json

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

package/src/services/bind.mjs

@@ -43,8 +43,6 @@ import { addHook } from "../hooks.mjs";
 import { owner_attribute } from "../common-attributes.mjs";
 import { NetworkAddress } from "../network-address.mjs";
 
-const bindNetworkAddressTypes = networkAddressType + "|bind_group";
-
 class bind_zone extends Base {
   static priority = 1;
   static key = "id";
@@ -63,6 +61,14 @@ class bind_zone extends Base {
     addType(this);
   }
 
+  get service() {
+    return this.owner.service;
+  }
+
+  get type() {
+    return this.service.serverType;
+  }
+
   get isCatalog() {
     return false;
   }
@@ -80,6 +86,11 @@ class bind_zone extends Base {
   }
 
   get file() {
+    const fileType = this.type === "master" ? "zone" : "raw";
+    return `${this.directory}/${this.domain}.${fileType}`;
+  }
+
+  get textFile() {
     return `${this.directory}/${this.domain}.zone`;
   }
 
@@ -209,7 +220,7 @@ class bind_zone_config extends Base {
 
       await writeLines(
         join(dir, "var/lib/named"),
-        zone.file,
+        zone.textFile,
         [...zone.records]
           .sort(sortZoneRecords)
           .map(r => r.toString(maxKeyLength, group.recordTTL))
@@ -684,6 +695,10 @@ export class bind extends CoreService {
       type: networkAddressType,
       deferredExpression: true
     },
+    serverType: {
+      ...string_attribute_writable,
+      name: "serverType"
+    },
     keys: {
       ...default_collection_attribute_writable,
       name: "keys",
@@ -751,8 +766,19 @@ export class bind extends CoreService {
   acls = new Map();
   groups = new Map();
 
+  set serverType(value) {
+    //console.log("SET SERVERTYPE", this.fullName, value);
+    this._serverType = value;
+  }
+
   get serverType() {
-    return this.primaries ? "secondary" : "primary";
+    /*console.log(
+      "GET SERVERTYPE",
+      this.fullName,
+      this._serverType ?? (this.primaries ? "secondary" : "primary")
+    );*/
+
+    return this._serverType ?? (this.primaries ? "secondary" : "primary");
   }
 
   async writeForwarders(outputControl) {