pmcf 6.12.0 → 6.13.1

package/README.md

@@ -80,6 +80,7 @@ generates config packages for:
 *   [SkeletonNetworkInterface](#skeletonnetworkinterface)
     *   [networkAddresses](#networkaddresses)
         *   [Parameters](#parameters-14)
+*   [type](#type)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
@@ -298,6 +299,12 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
 
+## type
+
+Type of the group.
+
+Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** view | unknown
+
 ## SystemdJournalRemoteService
 
 **Extends CoreService**

package/package.json

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

package/src/services/bind.mjs

@@ -166,10 +166,15 @@ class bind_group extends Base {
   }
 
   async packageContent(outputControl) {
+    outputControl.packageData.sources.push(
+      ...(await Array.fromAsync(
+        this.templateContent(...outputControl.permissions)
+      ))
+    );
+
     return (
       await Promise.all([
         this.generateACLs(outputControl),
-        this.generateTypeDefinition(outputControl),
         this.generateZoneDefs(outputControl, this.entries)
       ])
     ).find(r => r)
@@ -177,20 +182,6 @@ class bind_group extends Base {
       : false;
   }
 
-  async generateTypeDefinition(outputControl) {
-    if (this.type === "view") {
-      await writeLines(
-        join(outputControl.dir, "etc/named/views"),
-        `gen-${this.name}.conf`,
-        [
-          `view ${this.name} {`,
-          `include "/etc/named/views/${this.name}/*.conf";`,
-          "};"
-        ]
-      );
-    }
-  }
-
   async generateACLs(outputControl) {
     const acls = addressesStatement(
       `acl ${this.name}`,
@@ -552,7 +543,7 @@ export class bind extends ExtraSourceService {
       new FileContentProvider(dir + "/", ...permissions)
     );
 
-    const outputControl = newOutputControl(packageData, dir);
+    const outputControl = newOutputControl(packageData, dir, permissions);
 
     for (const group of this.groups.values()) {
       const present = await group.packageContent(outputControl);
@@ -638,6 +629,6 @@ export class bind extends ExtraSourceService {
   }
 }
 
-function newOutputControl(packageData, dir) {
-  return { configs: [], catalogs: new Map(), packageData, dir };
+function newOutputControl(packageData, dir, permissions) {
+  return { configs: [], catalogs: new Map(), packageData, dir, permissions };
 }