pmcf 1.21.0 → 1.21.2

package/bin/pmcf-location-defs

@@ -21,16 +21,29 @@ console.log("replaces", `mf-location-${location.name}`);
 console.log("description", `location definitions for ${location.name}`);
 
 async function generateLocationDefs(location, dir) {
-  const sl = (await Array.fromAsync(location.dns.services())).map(s=>s.ipAddresses).flat()
-  const s1 = sl.shift();
+  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: s1,
-      FallbackDNS: sl.join(","),
-      Domains: location.domain,
+      DNS: master.join(" "),
+      FallbackDNS: fallback.join(" "),
+      Domains: dns.domains.join(" "),
       DNSSEC: "no",
       MulticastDNS: "yes",
       LLMNR: "no"

package/package.json

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

package/src/dns.mjs

@@ -26,6 +26,10 @@ export class DNSService extends Base {
     }
   }
 
+  get domains() {
+    return [this.owner.domain];
+  }
+
   get propertyNames() {
     return ["recordTTL", "forwardsTo", "allowedUpdates"];
   }

package/src/model.mjs

@@ -865,7 +865,7 @@ export class Service extends Base {
 
     Object.assign(this, data);
 
-    this.owner = owner;
+  //  this.owner = owner;
 
     owner.addService(this);
   }
@@ -914,7 +914,7 @@ export class Service extends Base {
   }
 
   get priority() {
-    return /*this.#priority || */ this.owner.priority || 99;
+    return this.#priority || this.owner.priority || 99;
   }
 
   get weight() {

package/types/dns.d.mts

@@ -3,5 +3,6 @@ export class DNSService extends Base {
     recordTTL: string;
     forwardsTo: any[];
     services(): AsyncGenerator<any, void, any>;
+    get domains(): any[];
 }
 import { Base } from "./base.mjs";