pmcf 1.79.1 → 1.79.3

package/package.json

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

package/src/dns.mjs

@@ -101,20 +101,23 @@ export class DNSService extends Base {
   }
 
   get systemdConfig() {
-    return {
-      DNS: serviceAddresses(this, {
-        ...DNS_SERVICE_FILTER,
-        priority: "<10"
-      }).join(" "),
-      FallbackDNS: serviceAddresses(this, {
-        ...DNS_SERVICE_FILTER,
-        priority: ">=10"
-      }).join(" "),
-      Domains: [...this.domains].join(" "),
-      DNSSEC: "no",
-      MulticastDNS: "yes",
-      LLMNR: "no"
-    };
+    return [
+      "Resolve",
+      {
+        DNS: serviceAddresses(this, {
+          ...DNS_SERVICE_FILTER,
+          priority: "<10"
+        }).join(" "),
+        FallbackDNS: serviceAddresses(this, {
+          ...DNS_SERVICE_FILTER,
+          priority: ">=10"
+        }).join(" "),
+        Domains: [...this.domains].join(" "),
+        DNSSEC: "no",
+        MulticastDNS: "yes",
+        LLMNR: "no"
+      }
+    ];
   }
 
   async *preparePackages(stagingDir) {
@@ -133,9 +136,7 @@ export class DNSService extends Base {
 
     const options = [
       "forwarders {",
-      ...serviceAddresses(this.source, DNS_SERVICE_FILTER).map(
-        a => `  ${a};`
-      ),
+      ...serviceAddresses(this.source, DNS_SERVICE_FILTER).map(a => `  ${a};`),
       "};"
     ];
     await writeLines(join(p1, "etc/named.d/options"), `${name}.conf`, options);

package/src/location.mjs

@@ -11,7 +11,6 @@ const LocationTypeDefinition = {
   priority: 1.0,
   extends: Owner.typeDefinition,
   properties: {
-    country: { type: "string", writeable: true },
     locales: { type: "string", collection: true, writeable: true }
   }
 };
@@ -55,7 +54,7 @@ export class Location extends Owner {
       await writeLines(
         join(stagingDir, "etc/systemd/resolved.conf.d"),
         `${this.name}.conf`,
-        sectionLines("Resolve", this.dns.systemdConfig)
+        sectionLines(...this.dns.systemdConfig)
       );
 
       await writeLines(
@@ -71,7 +70,7 @@ export class Location extends Owner {
       await writeLines(
         join(stagingDir, "etc/systemd/timesyncd.conf.d"),
         `${this.name}.conf`,
-        sectionLines("Time", this.ntp.systemdConfig)
+        sectionLines(...this.ntp.systemdConfig)
       );
 
       const locationDir = join(stagingDir, "etc", "location");

package/src/ntp.mjs

@@ -51,15 +51,18 @@ export class NTPService extends Base {
   }
 
   get systemdConfig() {
-    return {
-      NTP: serviceAddresses(
-        this,
-        {
-          ...NTP_SERVICE_FILTER,
-          priority: "<20"
-        },
-        "domainName"
-      ).join(" ")
-    };
+    return [
+      "Time",
+      {
+        NTP: serviceAddresses(
+          this,
+          {
+            ...NTP_SERVICE_FILTER,
+            priority: "<20"
+          },
+          "domainName"
+        ).join(" ")
+      }
+    ];
   }
 }

package/types/dns.d.mts

@@ -83,14 +83,14 @@ export class DNSService extends Base {
     get trusted(): any[];
     set source(value: any[]);
     get source(): any[];
-    get systemdConfig(): {
+    get systemdConfig(): (string | {
         DNS: string;
         FallbackDNS: string;
         Domains: string;
         DNSSEC: string;
         MulticastDNS: string;
         LLMNR: string;
-    };
+    })[];
     preparePackages(stagingDir: any): AsyncGenerator<{
         sources: AsyncGenerator<any, void, unknown>[];
         outputs: Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;

package/types/location.d.mts

@@ -401,10 +401,6 @@ export class Location extends Owner {
             };
         };
         properties: {
-            country: {
-                type: string;
-                writeable: boolean;
-            };
             locales: {
                 type: string;
                 collection: boolean;

package/types/ntp.d.mts

@@ -13,9 +13,9 @@ export class NTPService extends Base {
     };
     set source(value: any[]);
     get source(): any[];
-    get systemdConfig(): {
+    get systemdConfig(): (string | {
         NTP: string;
-    };
+    })[];
     #private;
 }
 import { Base } from "./base.mjs";

package/types/root.d.mts

@@ -405,10 +405,6 @@ export class Root extends Location {
                 };
             };
             properties: {
-                country: {
-                    type: string;
-                    writeable: boolean;
-                };
                 locales: {
                     type: string;
                     collection: boolean;