pmcf 2.51.2 → 2.51.4

package/package.json

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

package/src/services/dhcp.mjs

@@ -126,56 +126,24 @@ export class DHCPService extends Service {
     );
 
     const peers = (
-      await Array.fromAsync(network.findServices({ type: "dhcp" }))
-    ).map(dhcp => {
-      const ctrlAgentEndpoint = dhcp.endpoint(
-        e => e.type === "kea-control-agent"
-      );
+      await Array.fromAsync(
+        network.findServices({ type: "dhcp", priority: ">10" })
+      )
+    )
+      .sort((a, b) => (a.host === host ? -1 : 1))
+      .map((dhcp, i) => {
+        const ctrlAgentEndpoint = dhcp.endpoint(
+          e => e.type === "kea-control-agent"
+        );
 
-      return {
-        name: dhcp.host.name,
-        role: dhcp.priority < 10 ? "primary" : "standby",
-        url: ctrlAgentEndpoint?.url
-      };
-    });
+        return {
+          name: dhcp.host.name,
+          role: i === 0 ? "primary" : "standby",
+          url: ctrlAgentEndpoint?.url
+        };
+      });
 
-    const commonConfig = {
-      "lease-database": {
-        type: "memfile",
-        "lfc-interval": 3600
-      },
-      "multi-threading": {
-        "enable-multi-threading": false
-      },
-      "expired-leases-processing": {
-        "reclaim-timer-wait-time": 10,
-        "flush-reclaimed-timer-wait-time": 25,
-        "hold-reclaimed-time": 3600,
-        "max-reclaim-leases": 100,
-        "max-reclaim-time": 250,
-        "unwarned-reclaim-cycles": 5
-      },
-      "renew-timer": 900,
-      "rebind-timer": 1800,
-      "valid-lifetime": 3600,
-      "hooks-libraries": [
-        {
-          library: "/usr/lib/kea/hooks/libdhcp_lease_cmds.so"
-        },
-        {
-          library: "/usr/lib/kea/hooks/libdhcp_ha.so",
-          parameters: {
-            "high-availability": [
-              {
-                "this-server-name": name,
-                mode: "hot-standby",
-                peers
-              }
-            ]
-          }
-        }
-      ]
-    };
+    peers.length = 2;
 
     const loggers = [
       {
@@ -189,6 +157,54 @@ export class DHCPService extends Service {
       }
     ];
 
+    const commonConfig = family => {
+      return {
+        "interfaces-config": {
+          interfaces: listenInterfaces(`IPv${family}`)
+        },
+        "control-socket": toUnix(
+          this.endpoint(e => e.type === `kea-control-dhcp${family}`)
+        ),
+        "lease-database": {
+          type: "memfile",
+          "lfc-interval": 3600
+        },
+        "multi-threading": {
+          "enable-multi-threading": false
+        },
+        "expired-leases-processing": {
+          "reclaim-timer-wait-time": 10,
+          "flush-reclaimed-timer-wait-time": 25,
+          "hold-reclaimed-time": 3600,
+          "max-reclaim-leases": 100,
+          "max-reclaim-time": 250,
+          "unwarned-reclaim-cycles": 5
+        },
+        "renew-timer": 900,
+        "rebind-timer": 1800,
+        "valid-lifetime": 3600,
+        "hooks-libraries": [
+          {
+            library: "/usr/lib/kea/hooks/libdhcp_lease_cmds.so"
+          },
+          {
+            library: "/usr/lib/kea/hooks/libdhcp_ha.so",
+            parameters: {
+              "high-availability": [
+                {
+                  "this-server-name": name,
+                  mode: "hot-standby",
+                  peers
+                }
+              ]
+            }
+          }
+        ],
+        "dhcp-ddns": dhcpServerDdns,
+        loggers
+      };
+    };
+
     const toUnix = endpoint => {
       return {
         "socket-type": "unix",
@@ -245,8 +261,8 @@ export class DHCPService extends Service {
 
     const dhcpServerDdns = {
       "enable-updates": true,
-      "ip-address": ddnsEndpoint.address,
-      port: ddnsEndpoint.port,
+      "server-ip": ddnsEndpoint.address,
+      "server-port": ddnsEndpoint.port,
       "max-queue-size": 64,
       "ncr-protocol": "UDP",
       "ncr-format": "JSON"
@@ -291,14 +307,7 @@ export class DHCPService extends Service {
     );
     const dhcp4 = {
       Dhcp4: {
-        ...commonConfig,
-        "interfaces-config": {
-          interfaces: listenInterfaces("IPv4")
-        },
-        "control-socket": {
-          "socket-type": "unix",
-          "socket-name": "/run/kea/4-ctrl-socket"
-        },
+        ...commonConfig("4"),
         "option-data": [
           {
             name: "domain-name-servers",
@@ -327,21 +336,12 @@ export class DHCPService extends Service {
               ],
               reservations
             };
-          }),
-        "dhcp-ddns": dhcpServerDdns,
-        loggers
+          })
       }
     };
     const dhcp6 = {
       Dhcp6: {
-        ...commonConfig,
-        "interfaces-config": {
-          interfaces: listenInterfaces("IPv6")
-        },
-        "control-socket": {
-          "socket-type": "unix",
-          "socket-name": "/run/kea/6-ctrl-socket"
-        },
+        ...commonConfig("6"),
         "preferred-lifetime": 3000,
         "option-data": [
           {
@@ -374,9 +374,7 @@ export class DHCPService extends Service {
                 }*/
               ]
             };
-          }),
-        "dhcp-ddns": dhcpServerDdns,
-        loggers
+          })
       }
     };