pmcf 6.41.9 → 6.42.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/src/services/kea.mjs +10 -13
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "pmcf",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.42.0",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"content-entry-transform": "^1.7.6",
|
|
55
55
|
"ip-utilties": "^3.13.1",
|
|
56
56
|
"npm-pkgbuild": "^22.1.3",
|
|
57
|
-
"pacc": "^11.
|
|
57
|
+
"pacc": "^11.9.0",
|
|
58
58
|
"package-directory": "^8.2.0",
|
|
59
59
|
"yaml": "^2.9.0"
|
|
60
60
|
},
|
package/src/services/kea.mjs
CHANGED
|
@@ -3,8 +3,10 @@ import { FileContentProvider } from "npm-pkgbuild";
|
|
|
3
3
|
import {
|
|
4
4
|
reverseArpa,
|
|
5
5
|
isLinkLocal,
|
|
6
|
+
addressType,
|
|
6
7
|
FAMILY_IPV4,
|
|
7
|
-
FAMILY_IPV6
|
|
8
|
+
FAMILY_IPV6,
|
|
9
|
+
ADDRESS_TYPE_LOOPBACK
|
|
8
10
|
} from "ip-utilties";
|
|
9
11
|
import {
|
|
10
12
|
string_attribute_writable,
|
|
@@ -17,9 +19,7 @@ import {
|
|
|
17
19
|
addType,
|
|
18
20
|
CoreService,
|
|
19
21
|
Endpoint,
|
|
20
|
-
endpointAddresses,
|
|
21
22
|
sortDescendingByPriority,
|
|
22
|
-
endpoints,
|
|
23
23
|
SUBNET_LOCALHOST_IPV4,
|
|
24
24
|
SUBNET_LOCALHOST_IPV6,
|
|
25
25
|
FAMILY_UNIX
|
|
@@ -28,10 +28,10 @@ import { writeLines } from "../utils.mjs";
|
|
|
28
28
|
|
|
29
29
|
export class kea extends CoreService {
|
|
30
30
|
static attributes = {
|
|
31
|
-
|
|
31
|
+
dnsServerEndpoints: {
|
|
32
32
|
...default_collection_attribute_writable,
|
|
33
33
|
type: Endpoint,
|
|
34
|
-
name: "
|
|
34
|
+
name: "dnsServerEndpoints",
|
|
35
35
|
deferredExpression: true
|
|
36
36
|
},
|
|
37
37
|
"ddns-send-updates": {
|
|
@@ -156,12 +156,7 @@ export class kea extends CoreService {
|
|
|
156
156
|
subnets.map(s => s.fullName)
|
|
157
157
|
);*/
|
|
158
158
|
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
const dnsServerEndpoints = endpoints(this.dnsServers).filter(
|
|
162
|
-
e => e.networkInterface?.kind !== "loopback"
|
|
163
|
-
);
|
|
164
|
-
|
|
159
|
+
const dnsServerEndpoints = this.dnsServerEndpoints;
|
|
165
160
|
const packageData = await this.packageData;
|
|
166
161
|
|
|
167
162
|
packageData.sources.push(
|
|
@@ -270,7 +265,8 @@ export class kea extends CoreService {
|
|
|
270
265
|
data: dnsServerEndpoints
|
|
271
266
|
.filter(
|
|
272
267
|
endpoint =>
|
|
273
|
-
endpoint.family === `IPv${family}` &&
|
|
268
|
+
endpoint.family === `IPv${family}` &&
|
|
269
|
+
addressType(endpoint.address) !== ADDRESS_TYPE_LOOPBACK
|
|
274
270
|
)
|
|
275
271
|
.map(endpoint => endpoint.address)
|
|
276
272
|
.join(",")
|
|
@@ -322,7 +318,8 @@ export class kea extends CoreService {
|
|
|
322
318
|
"dns-servers": dnsServerEndpoints
|
|
323
319
|
.filter(
|
|
324
320
|
endpoint =>
|
|
325
|
-
endpoint.family === FAMILY_IPV4 &&
|
|
321
|
+
endpoint.family === FAMILY_IPV4 &&
|
|
322
|
+
addressType(endpoint.address) !== ADDRESS_TYPE_LOOPBACK
|
|
326
323
|
)
|
|
327
324
|
.map(endpoint => {
|
|
328
325
|
return { "ip-address": endpoint.address };
|