pmcf 2.59.1 → 2.59.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.59.1",
+  "version": "2.59.3",
   "publishConfig": {
     "access": "public"
   },
@@ -45,7 +45,7 @@
     "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "dependencies": {
-    "ip-utilties": "^1.4.1",
+    "ip-utilties": "^1.4.2",
     "npm-pkgbuild": "^18.2.8",
     "pacc": "^3.4.3",
     "pkg-dir": "^8.0.0"

package/src/services/kea.mjs

@@ -354,18 +354,19 @@ export class KeaService extends Service {
       }
     }
 
-    const reservations = [...hwmap]
-      .map(([k, networkInterface]) => {
-        return {
-          "hw-address": k,
-          "ip-address": networkInterface.networkAddress(
-            n => n.family === "IPv4"
-          ).address,
-          hostname: networkInterface.domainName,
-          "client-classes": ["SKIP_DDNS"]
-        };
-      })
-      .sort((a, b) => a.hostname.localeCompare(b.hostname));
+    const reservations = family =>
+      [...hwmap]
+        .map(([k, networkInterface]) => {
+          return {
+            "hw-address": k,
+            "ip-address": networkInterface.networkAddress(
+              n => n.family === `IPv${family}`
+            )?.address,
+            hostname: networkInterface.domainName,
+            "client-classes": ["SKIP_DDNS"]
+          };
+        })
+        .sort((a, b) => a.hostname.localeCompare(b.hostname));
 
     const listenInterfaces = family =>
       this.endpoints(
@@ -399,7 +400,7 @@ export class KeaService extends Service {
                   data: network.gateway.address
                 }
               ],
-              reservations
+              reservations: reservations("4")
             };
           })
       }
@@ -424,12 +425,7 @@ export class KeaService extends Service {
                   "delegated-len": 64
                 }
               ],*/
-              reservations: [
-                /*{
-                  duid: "01:02:03:04:05:0A:0B:0C:0D:0E",
-                  "ip-addresses": ["2001:db8:1::100"]
-                }*/
-              ]
+              reservations: reservations("6")
             };
           })
       }

package/src/services/systemd-journal-upload.mjs

@@ -7,7 +7,9 @@ const SystemdJournalUploadServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
   priority: 0.1,
-  properties: {}
+  properties: {
+    url: { type: "string", collection: false, writeable: true }
+  }
 };
 
 export class SystemdJournalUploadService extends Service {
@@ -37,7 +39,7 @@ export class SystemdJournalUploadService extends Service {
       serviceName: "systemd-journal-upload",
       configFileName: `etc/systemd/journal-upload.conf.d/${name}.conf`,
       content: ["Upload", {
-        URL : ""
+        URL : this.url
       }]
     };
   }

package/src/services/systemd-resolved.mjs

@@ -53,7 +53,7 @@ export class SystemdResolvedService extends ExtraSourceService {
       content: [
         "Resolve",
         {
-          DNS: serviceEndpoints(this, options(">=300", 2)),
+          DNS: serviceEndpoints(this, options("[300:399]", 4)),
           FallbackDNS: serviceEndpoints(this, options("[100:199]", 4)),
           Domains: [...this.localDomains].join(" "),
           DNSSEC: "no",

package/types/services/systemd-journal-upload.d.mts

@@ -241,7 +241,13 @@ export class SystemdJournalUploadService extends Service {
             };
         };
         priority: number;
-        properties: {};
+        properties: {
+            url: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
+        };
     };
     get type(): string;
     get systemdServices(): string;
@@ -249,7 +255,7 @@ export class SystemdJournalUploadService extends Service {
         serviceName: string;
         configFileName: string;
         content: (string | {
-            URL: string;
+            URL: any;
         })[];
     };
 }