pmcf 6.31.2 → 6.31.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.31.2",
+  "version": "6.31.4",
   "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))
@@ -235,8 +246,19 @@ export class bind_key extends Base {
     addType(this);
   }
 
-  get service() {
-    return this.owner;
+  async packageContent(outputControl) {
+    await writeLines(
+      join(outputControl.dir, "etc/named/keys"),
+      `${this.name}.conf`,
+      [
+        `key "${this.name}" {`,
+        `  algorithm ${this.algorithm};`,
+        `  secret "${this.secret}";`,
+        "};"
+      ]
+    );
+
+    return true;
   }
 }
 
@@ -781,9 +803,14 @@ export class bind extends CoreService {
 
     const outputControl = { packageData, dir, permissions };
 
+    for (const key of this.keys.values()) {
+      await key.packageContent(outputControl);
+      hasContent = true;
+    }
+
     for (const acl of this.acls.values()) {
-      const present = await acl.packageContent(outputControl);
-      hasContent ||= present;
+      await acl.packageContent(outputControl);
+      hasContent = true;
     }
 
     for (const group of this.groups.values()) {