pmcf 2.53.10 → 2.54.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.53.10",
+  "version": "2.54.0",
   "publishConfig": {
     "access": "public"
   },
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "ip-utilties": "^1.3.3",
-    "npm-pkgbuild": "^18.2.5",
+    "npm-pkgbuild": "^18.2.8",
     "pacc": "^3.4.2",
     "pkg-dir": "^8.0.0"
   },

package/src/module.mjs

@@ -18,8 +18,8 @@ export * from "./service.mjs";
 export * from "./extra-source-service.mjs";
 export * from "./endpoint.mjs";
 export * from "./services/bind.mjs";
-export * from "./services/ntp.mjs";
-export * from "./services/dhcp.mjs";
+export * from "./services/chrony.mjs";
+export * from "./services/kea.mjs";
 export * from "./services/systemd-journal.mjs";
 export * from "./services/systemd-timesyncd.mjs";
 export * from "./services/systemd-resolved.mjs";

package/src/service.mjs

@@ -13,7 +13,7 @@ const ServiceTypes = {
   "pacman-repo": {
     extends: ["https"]
   },
-  ntp: { endpoints: [{ protocol: "udp", port: 123, tls: false }] },
+  ntp: { endpoints: [{ protocol: "udp", port: 123, tls: false, isPool: false }] },
   //bind: { extends: ["dns"] },
   dns: { endpoints: [{ protocol: "udp", port: 53, tls: false }] },
   ldap: { endpoints: [{ protocol: "tcp", port: 389, tls: false }] },

package/src/services/bind.mjs

@@ -22,8 +22,8 @@ import { addHook } from "../hooks.mjs";
 
 const address_types = ["network", "host", "network_interface"];
 
-const BINDServiceTypeDefinition = {
-  name: "dns",
+const BindServiceTypeDefinition = {
+  name: "bind",
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
   extends: ExtraSourceServiceTypeDefinition,
@@ -113,7 +113,7 @@ function addressesStatement(prefix, objects, generateEmpty = false) {
   return [];
 }
 
-export class BINDService extends ExtraSourceService {
+export class BindService extends ExtraSourceService {
   allowedUpdates = [];
   recordTTL = "1W";
   hasSVRRecords = true;
@@ -139,16 +139,16 @@ export class BINDService extends ExtraSourceService {
   }
 
   static get typeDefinition() {
-    return BINDServiceTypeDefinition;
+    return BindServiceTypeDefinition;
   }
 
   constructor(owner, data) {
     super(owner, data);
-    this.read(data, BINDServiceTypeDefinition);
+    this.read(data, BindServiceTypeDefinition);
   }
 
   get type() {
-    return BINDServiceTypeDefinition.name;
+    return "dns"; // BindServiceTypeDefinition.name;
   }
 
   endpoints(filter) {

package/src/services/{ntp.mjs → chrony.mjs}

@@ -8,8 +8,8 @@ import {
 } from "../extra-source-service.mjs";
 import { writeLines } from "../utils.mjs";
 
-const NTPServiceTypeDefinition = {
-  name: "ntp",
+const ChronyServiceTypeDefinition = {
+  name: "chrony",
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
   extends: ExtraSourceServiceTypeDefinition,
@@ -24,22 +24,22 @@ const NTPServiceTypeDefinition = {
   }
 };
 
-export class NTPService extends ExtraSourceService {
+export class ChronyService extends ExtraSourceService {
   static {
     addType(this);
   }
 
   static get typeDefinition() {
-    return NTPServiceTypeDefinition;
+    return ChronyServiceTypeDefinition;
   }
 
   constructor(owner, data) {
     super(owner, data);
-    this.read(data, NTPServiceTypeDefinition);
+    this.read(data, ChronyServiceTypeDefinition);
   }
 
   get type() {
-    return NTPServiceTypeDefinition.name;
+    return "ntp"; //ChronyServiceTypeDefinition.name;
   }
 
   async *preparePackages(dir) {

package/src/services/{dhcp.mjs → kea.mjs}

@@ -15,8 +15,8 @@ import {
 import { addType } from "../types.mjs";
 import { writeLines } from "../utils.mjs";
 
-const DHCPServiceTypeDefinition = {
-  name: "dhcp",
+const KeaServiceTypeDefinition = {
+  name: "kea",
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
@@ -76,22 +76,22 @@ const controlDDNSEndpoint = {
 const keaVersion = 2.6;
 export const fetureHasHTTPEndpoints = keaVersion > 2.7;
 
-export class DHCPService extends Service {
+export class KeaService extends Service {
   static {
     addType(this);
   }
 
   static get typeDefinition() {
-    return DHCPServiceTypeDefinition;
+    return KeaServiceTypeDefinition;
   }
 
   constructor(owner, data) {
     super(owner, data);
-    this.read(data, DHCPServiceTypeDefinition);
+    this.read(data, KeaServiceTypeDefinition);
   }
 
   get type() {
-    return DHCPServiceTypeDefinition.name;
+    return "dhcp"; //KeaServiceTypeDefinition.name;
   }
 
   endpoints(filter) {

package/types/module.d.mts

@@ -18,8 +18,8 @@ export * from "./service.mjs";
 export * from "./extra-source-service.mjs";
 export * from "./endpoint.mjs";
 export * from "./services/bind.mjs";
-export * from "./services/ntp.mjs";
-export * from "./services/dhcp.mjs";
+export * from "./services/chrony.mjs";
+export * from "./services/kea.mjs";
 export * from "./services/systemd-journal.mjs";
 export * from "./services/systemd-timesyncd.mjs";
 export * from "./services/systemd-resolved.mjs";

package/types/services/bind.d.mts

@@ -1,4 +1,4 @@
-export class BINDService extends ExtraSourceService {
+export class BindService extends ExtraSourceService {
     static get typeDefinition(): {
         name: string;
         specializationOf: {

package/types/services/{ntp.d.mts → chrony.d.mts}

@@ -1,4 +1,4 @@
-export class NTPService extends ExtraSourceService {
+export class ChronyService extends ExtraSourceService {
     static get typeDefinition(): {
         name: string;
         specializationOf: {

package/types/services/{dhcp.d.mts → kea.d.mts}

@@ -1,5 +1,5 @@
 export const fetureHasHTTPEndpoints: boolean;
-export class DHCPService extends Service {
+export class KeaService extends Service {
     static get typeDefinition(): {
         name: string;
         specializationOf: {