pmcf 2.65.2 → 2.65.4

package/package.json

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

package/src/services/bind.mjs

@@ -16,7 +16,7 @@ import {
   addresses
 } from "pmcf";
 import { addType } from "../types.mjs";
-import { serviceTypeEndpoints } from "../service-types.mjs";
+import { serviceTypeEndpoints, addServiceTypes } from "../service-types.mjs";
 import { Service, ServiceTypeDefinition } from "../service.mjs";
 import { ExtraSourceServiceTypeDefinition } from "../extra-source-service.mjs";
 import { addHook } from "../hooks.mjs";
@@ -91,6 +91,9 @@ const BindServiceTypeDefinition = {
 };
 
 const BindServiceTypes = {
+  "bind": {
+    extends: ["dns"]
+  },
   "bind-statistics": {
     endpoints: [
       {
@@ -105,19 +108,8 @@ const BindServiceTypes = {
   }
 };
 
-const rdncEndpoint = {
-  type: "rdnc",
-  port: 953,
-  protocol: "tcp",
-  tls: false
-};
-
-const statisticsEndpoint = {
-  type: "bind-statistics",
-  port: 19521,
-  protocol: "tcp",
-  tls: false
-};
+const rdncEndpoint = BindServiceTypes.rdnc.endpoints[0];
+const statisticsEndpoint = BindServiceTypes["bind-statistics"].endpoints[0];
 
 function addressesStatement(prefix, objects, generateEmpty = false) {
   const body = asArray(objects).map(name => `  ${name};`);
@@ -150,6 +142,7 @@ export class BindService extends ExtraSourceService {
 
   static {
     addType(this);
+    addServiceTypes(BindServiceTypes);
   }
 
   static get typeDefinition() {

package/src/services/kea.mjs

@@ -12,6 +12,7 @@ import {
   SUBNET_LOCALHOST_IPV4,
   SUBNET_LOCALHOST_IPV6
 } from "pmcf";
+import { addServiceTypes } from "../service-types.mjs";
 import { addType } from "../types.mjs";
 import { writeLines } from "../utils.mjs";
 
@@ -73,12 +74,38 @@ const controlDDNSEndpoint = {
   path: "/run/kea/ddns-ctrl-socket"
 };
 
+const KEAServiceTypes = {
+  kea: { extends: ["dhcp"] },
+  "kea-ddns": {
+    endpoints: [ddnsEndpoint]
+  },
+  "kea-control-agent": {
+    endpoints: [controlAgentEndpoint]
+  },
+  "kea-ha-4": {
+    endpoints: [ha4Endpoint]
+  },
+  "kea-ha-6": {
+    endpoints: [ha6Endpoint]
+  },
+  "kea-control-dhcp4": {
+    endpoints: [control4Endpoint]
+  },
+  "kea-control-dhcp6": {
+    endpoints: [control6Endpoint]
+  },
+  "kea-control-ddns": {
+    endpoints: [controlDDNSEndpoint]
+  }
+};
+
 const keaVersion = 2.6;
 export const fetureHasHTTPEndpoints = keaVersion > 2.7;
 
 export class KeaService extends Service {
   static {
     addType(this);
+    addServiceTypes(KEAServiceTypes);
   }
 
   static get typeDefinition() {
@@ -367,9 +394,7 @@ export class KeaService extends Service {
 
           if (addr && subnet.matchesAddress(addr)) {
             ip =
-              family == 6
-                ? { "ip-addresses": [addr] }
-                : { "ip-address": addr };
+              family == 6 ? { "ip-addresses": [addr] } : { "ip-address": addr };
           }
 
           return {