pmcf 3.7.1 → 3.7.2
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 +1 -1
- package/src/network.mjs +8 -3
- package/src/services/kea.mjs +4 -7
- package/types/network.d.mts +19 -1
- package/types/services/kea.d.mts +3 -3
package/package.json
CHANGED
package/src/network.mjs
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { default_attribute_writable } from "pacc";
|
|
1
2
|
import { Owner } from "./owner.mjs";
|
|
2
3
|
import { Subnet } from "./subnet.mjs";
|
|
3
4
|
import { addType } from "./types.mjs";
|
|
@@ -10,8 +11,12 @@ const NetworkTypeDefinition = {
|
|
|
10
11
|
extends: Owner.typeDefinition,
|
|
11
12
|
properties: {
|
|
12
13
|
...networkProperties,
|
|
13
|
-
bridge: {
|
|
14
|
-
|
|
14
|
+
bridge: {
|
|
15
|
+
...default_attribute_writable,
|
|
16
|
+
type: "network",
|
|
17
|
+
collection: true
|
|
18
|
+
},
|
|
19
|
+
gateway: { ...default_attribute_writable, type: "host" }
|
|
15
20
|
}
|
|
16
21
|
};
|
|
17
22
|
|
|
@@ -40,7 +45,7 @@ export class Network extends Owner {
|
|
|
40
45
|
}
|
|
41
46
|
|
|
42
47
|
get address() {
|
|
43
|
-
for(const subnet of this.subnets()) {
|
|
48
|
+
for (const subnet of this.subnets()) {
|
|
44
49
|
return subnet.address;
|
|
45
50
|
}
|
|
46
51
|
}
|
package/src/services/kea.mjs
CHANGED
|
@@ -3,7 +3,7 @@ import { FileContentProvider } from "npm-pkgbuild";
|
|
|
3
3
|
import { reverseArpa } from "ip-utilties";
|
|
4
4
|
import {
|
|
5
5
|
string_attribute,
|
|
6
|
-
|
|
6
|
+
number_attribute_writable,
|
|
7
7
|
boolean_attribute_writable_true
|
|
8
8
|
} from "pacc";
|
|
9
9
|
import {
|
|
@@ -29,20 +29,17 @@ const KeaServiceTypeDefinition = {
|
|
|
29
29
|
isCommonOption: true
|
|
30
30
|
},
|
|
31
31
|
"renew-timer": {
|
|
32
|
-
...
|
|
33
|
-
writable: true,
|
|
32
|
+
...number_attribute_writable,
|
|
34
33
|
isCommonOption: true,
|
|
35
34
|
default: 900
|
|
36
35
|
},
|
|
37
36
|
"rebind-timer": {
|
|
38
|
-
...
|
|
39
|
-
writable: true,
|
|
37
|
+
...number_attribute_writable,
|
|
40
38
|
isCommonOption: true,
|
|
41
39
|
default: 1800
|
|
42
40
|
},
|
|
43
41
|
"valid-lifetime": {
|
|
44
|
-
...
|
|
45
|
-
writable: true,
|
|
42
|
+
...number_attribute_writable,
|
|
46
43
|
mandatory: true,
|
|
47
44
|
isCommonOption: true,
|
|
48
45
|
default: 86400
|
package/types/network.d.mts
CHANGED
|
@@ -243,12 +243,30 @@ export class Network extends Owner {
|
|
|
243
243
|
bridge: {
|
|
244
244
|
type: string;
|
|
245
245
|
collection: boolean;
|
|
246
|
+
isKey: boolean;
|
|
246
247
|
writable: boolean;
|
|
248
|
+
mandatory: boolean;
|
|
249
|
+
private?: boolean;
|
|
250
|
+
depends?: string;
|
|
251
|
+
description?: string;
|
|
252
|
+
default?: any;
|
|
253
|
+
set?: Function;
|
|
254
|
+
get?: Function;
|
|
255
|
+
env?: string[] | string;
|
|
247
256
|
};
|
|
248
257
|
gateway: {
|
|
249
258
|
type: string;
|
|
250
|
-
|
|
259
|
+
isKey: boolean;
|
|
251
260
|
writable: boolean;
|
|
261
|
+
mandatory: boolean;
|
|
262
|
+
collection: boolean;
|
|
263
|
+
private?: boolean;
|
|
264
|
+
depends?: string;
|
|
265
|
+
description?: string;
|
|
266
|
+
default?: any;
|
|
267
|
+
set?: Function;
|
|
268
|
+
get?: Function;
|
|
269
|
+
env?: string[] | string;
|
|
252
270
|
};
|
|
253
271
|
scope: {
|
|
254
272
|
writable: boolean;
|
package/types/services/kea.d.mts
CHANGED
|
@@ -469,11 +469,11 @@ export class KeaService extends Service {
|
|
|
469
469
|
env?: string[] | string;
|
|
470
470
|
};
|
|
471
471
|
"renew-timer": {
|
|
472
|
-
writable: boolean;
|
|
473
472
|
isCommonOption: boolean;
|
|
474
473
|
default: number;
|
|
475
474
|
type: string;
|
|
476
475
|
isKey: boolean;
|
|
476
|
+
writable: boolean;
|
|
477
477
|
mandatory: boolean;
|
|
478
478
|
collection: boolean;
|
|
479
479
|
private?: boolean;
|
|
@@ -484,11 +484,11 @@ export class KeaService extends Service {
|
|
|
484
484
|
env?: string[] | string;
|
|
485
485
|
};
|
|
486
486
|
"rebind-timer": {
|
|
487
|
-
writable: boolean;
|
|
488
487
|
isCommonOption: boolean;
|
|
489
488
|
default: number;
|
|
490
489
|
type: string;
|
|
491
490
|
isKey: boolean;
|
|
491
|
+
writable: boolean;
|
|
492
492
|
mandatory: boolean;
|
|
493
493
|
collection: boolean;
|
|
494
494
|
private?: boolean;
|
|
@@ -499,12 +499,12 @@ export class KeaService extends Service {
|
|
|
499
499
|
env?: string[] | string;
|
|
500
500
|
};
|
|
501
501
|
"valid-lifetime": {
|
|
502
|
-
writable: boolean;
|
|
503
502
|
mandatory: boolean;
|
|
504
503
|
isCommonOption: boolean;
|
|
505
504
|
default: number;
|
|
506
505
|
type: string;
|
|
507
506
|
isKey: boolean;
|
|
507
|
+
writable: boolean;
|
|
508
508
|
collection: boolean;
|
|
509
509
|
private?: boolean;
|
|
510
510
|
depends?: string;
|