pmcf 6.8.4 → 6.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.8.4",
+  "version": "6.9.1",
   "publishConfig": {
     "access": "public"
   },
@@ -63,7 +63,7 @@
     "ava": "^8.0.1",
     "c8": "^12.0.0",
     "documentation": "^14.0.3",
-    "semantic-release": "^25.0.7"
+    "semantic-release": "^25.0.8"
   },
   "engines": {
     "node": ">=26.4.0"

package/src/services/bind.mjs

@@ -156,12 +156,13 @@ class bind_group extends Base {
   }
 
   async packageContent(outputControl) {
-    return await this.generateACLs(outputControl) && await this.generateZoneDefs(outputControl, this.entries);
+    return (
+      (await this.generateACLs(outputControl)) &&
+      (await this.generateZoneDefs(outputControl, this.entries))
+    );
   }
 
   async generateACLs(outputControl) {
-    console.log("generateACLs", this.name);
-
     const acls = addressesStatement(
       `acl ${this.name}`,
       addresses(this.access, { aggregate: true })
@@ -181,8 +182,6 @@ class bind_group extends Base {
   }
 
   async generateZoneDefs(outputControl, sources) {
-    console.log("generateZoneDefs", this.name);
-
     for (const source of sources) {
       console.log(
         "ZONE",
@@ -494,27 +493,38 @@ export class bind extends ExtraSourceService {
         `forwarders.conf`,
         addressesStatement("forwarders", forwarders)
       );
+
+      return true;
     }
 
-    return forwarders.length > 0;
+    return false;
   }
 
   async *preparePackages(dir) {
+    const permissions = this.packageContentPermissions;
     const packageData = this.packageData;
-    packageData.sources.push(new FileContentProvider(dir));
 
-    const outputControl = newOutputControl(packageData, dir);
+    packageData.sources = await Array.fromAsync(
+      this.templateContent(...permissions)
+    );
+
+    let hasContent = packageData.sources.length > 0;
 
-    let hasContent = false;
+    packageData.sources.push(
+      new FileContentProvider(dir + "/", ...permissions)
+    );
+
+    const outputControl = newOutputControl(packageData, dir);
 
     for (const group of this.groups.values()) {
       const present = await group.packageContent(outputControl);
       hasContent ||= present;
     }
 
-    hasContent ||= await this.writeForwarders(outputControl);
+    const present = await this.writeForwarders(outputControl);
 
-    if (hasContent) {
+    if (hasContent || present) {
+      console.log(packageData);
       yield packageData;
     }