pmcf 1.25.1 → 1.26.0

package/bin/pmcf-location-defs

@@ -22,33 +22,10 @@ console.log("replaces", `mf-location-${location.name}`);
 console.log("description", `location definitions for ${location.name}`);
 
 async function generateLocationDefs(location, dir) {
-  const dns = location.dns;
-  const dnsServices = (await Array.fromAsync(dns.services())).sort(
-    (a, b) => a.priority - b.priority
-  );
-
-  console.log(dnsServices);
-
-  const master = dnsServices
-    .filter(s => s.priority < 10)
-    .map(s => s.ipAddresses)
-    .flat();
-  const fallback = dnsServices
-    .filter(s => s.priority >= 10)
-    .map(s => s.ipAddresses)
-    .flat();
-
   await writeLines(
     join(dir, "etc/systemd/resolved.conf.d"),
     `${location.name}.conf`,
-    sectionLines("Resolve", {
-      DNS: master.join(" "),
-      FallbackDNS: fallback.join(" "),
-      Domains: dns.domains.join(" "),
-      DNSSEC: "no",
-      MulticastDNS: "yes",
-      LLMNR: "no"
-    })
+    sectionLines("Resolve", await location.dns.resolvedConfig())
   );
 
   await writeLines(
@@ -75,7 +52,7 @@ async function generateLocationDefs(location, dir) {
 
   await mkdir(locationDir, { recursive: true });
 
-  copyFile(
+  await copyFile(
     join(location.directory, "location.json"),
     join(locationDir, "location.json")
   );

package/bin/pmcf-named-defs

@@ -42,8 +42,8 @@ async function generateNamedDefs(owner, targetDir) {
     const createRecord = (key, type, value) => {
       return {
         key,
-        type,
-        value,
+       /*type,
+        value,*/
         toString: () =>
           `${key.padEnd(maxKeyLength, " ")} ${ttl} IN ${type.padEnd(
             5,

package/package.json

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

package/src/dns.mjs

@@ -33,4 +33,28 @@ export class DNSService extends Base {
   get propertyNames() {
     return ["recordTTL", "forwardsTo", "allowedUpdates"];
   }
+
+  async resolvedConfig() {
+    const dnsServices = (await Array.fromAsync(this.services())).sort(
+      (a, b) => a.priority - b.priority
+    );
+
+    const master = dnsServices
+      .filter(s => s.priority < 10)
+      .map(s => s.ipAddresses)
+      .flat();
+    const fallback = dnsServices
+      .filter(s => s.priority >= 10)
+      .map(s => s.ipAddresses)
+      .flat();
+
+    return {
+      DNS: master.join(" "),
+      FallbackDNS: fallback.join(" "),
+      Domains: this.domains.join(" "),
+      DNSSEC: "no",
+      MulticastDNS: "yes",
+      LLMNR: "no"
+    };
+  }
 }

package/types/dns.d.mts

@@ -4,5 +4,13 @@ export class DNSService extends Base {
     forwardsTo: any[];
     services(): AsyncGenerator<any, void, any>;
     get domains(): any[];
+    resolvedConfig(): Promise<{
+        DNS: string;
+        FallbackDNS: string;
+        Domains: string;
+        DNSSEC: string;
+        MulticastDNS: string;
+        LLMNR: string;
+    }>;
 }
 import { Base } from "./base.mjs";