pmcf 1.87.2 → 1.87.4

package/package.json

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

package/src/dns.mjs

@@ -41,6 +41,22 @@ const DNSServiceTypeDefinition = {
 
 const DNS_SERVICE_FILTER = { type: DNSServiceTypeDefinition.name };
 
+function addressList(objects) {
+  return Array.from(objects).map(object =>
+    typeof object === "string" ? object : object.name
+  );
+}
+
+function addressesStatement(prefix, objects, generateEmpty = false) {
+  const body = addressList(objects).map(name => `  ${name};`);
+
+  if (body.length || generateEmpty) {
+    return [`${prefix} {`, body, "};"];
+  }
+
+  return [];
+}
+
 export class DNSService extends Base {
   allowedUpdates = [];
   recordTTL = "1W";
@@ -146,33 +162,28 @@ export class DNSService extends Base {
       }
     };
 
-    const options = [
-      "forwarders {",
-      ...serviceAddresses(this.source, DNS_SERVICE_FILTER).map(a => `  ${a};`),
-      "};"
-    ];
-    await writeLines(join(p1, "etc/named/options"), `forwarders.conf`, options);
-
-    const category = [
-      "acl trusted {",
-      ...Array.from(subnets(this.trusted)).map(subnet => `  ${subnet.name};`),
-      "};",
-      "",
-      "acl protected {",
-      ...Array.from(subnets(this.protected)).map(subnet => `  ${subnet.name};`),
-      "};",
-      "",
-      "acl open {",
-      "};"
-    ];
-
-    await writeLines(
-      join(p1, "etc/named"),
-      `0-${name}.conf`,
-      category
+    const options = addressesStatement(
+      "forwarders",
+      serviceAddresses(this.source, DNS_SERVICE_FILTER)
     );
+    if (options.length > 2) {
+      await writeLines(
+        join(p1, "etc/named/options"),
+        `forwarders.conf`,
+        options
+      );
+    }
+
+    const acls = [
+      addressesStatement("acl trusted", subnets(this.trusted)),
+      addressesStatement("acl protected", subnets(this.protected)),
+      addressesStatement("acl open", [], true)
+    ].flat();
 
-    if (options.length > 2 || category.length > 8) {
+    if (acls.length) {
+      await writeLines(join(p1, "etc/named"), `0-acl-${name}.conf`, acls);
+    }
+    if (options.length || acls.length) {
       yield packageData;
     }
 
@@ -187,17 +198,19 @@ export class DNSService extends Base {
     };
 
     packageData.sources = [
-      new FileContentProvider(p2 + "/", {
-        mode: 0o644,
-        owner: "named",
-        group: "named"
-      }, {
-        mode: 0o755,
-        owner: "named",
-        group: "named"
-      })[
-        Symbol.asyncIterator
-      ]()
+      new FileContentProvider(
+        p2 + "/",
+        {
+          mode: 0o644,
+          owner: "named",
+          group: "named"
+        },
+        {
+          mode: 0o755,
+          owner: "named",
+          group: "named"
+        }
+      )[Symbol.asyncIterator]()
     ];
 
     await generateZoneDefs(this, packageData);