pmcf 3.8.12 → 3.8.13
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/services/kea.mjs +5 -11
- package/types/services/kea.d.mts +1 -2
package/package.json
CHANGED
package/src/services/kea.mjs
CHANGED
|
@@ -2,7 +2,7 @@ import { join } from "node:path";
|
|
|
2
2
|
import { FileContentProvider } from "npm-pkgbuild";
|
|
3
3
|
import { reverseArpa } from "ip-utilties";
|
|
4
4
|
import {
|
|
5
|
-
|
|
5
|
+
string_attribute_writable,
|
|
6
6
|
number_attribute_writable,
|
|
7
7
|
boolean_attribute_writable_true
|
|
8
8
|
} from "pacc";
|
|
@@ -45,8 +45,7 @@ const KeaServiceTypeDefinition = {
|
|
|
45
45
|
default: 86400
|
|
46
46
|
},
|
|
47
47
|
"ddns-conflict-resolution-mode": {
|
|
48
|
-
...
|
|
49
|
-
writable: true,
|
|
48
|
+
...string_attribute_writable,
|
|
50
49
|
isCommonOption: true
|
|
51
50
|
//values: ["check-exists-with-dhcid","no-check-with-dhcid"]
|
|
52
51
|
}
|
|
@@ -126,8 +125,7 @@ const KeaServiceTypeDefinition = {
|
|
|
126
125
|
}
|
|
127
126
|
};
|
|
128
127
|
|
|
129
|
-
const keaVersion = 3.0;
|
|
130
|
-
export const fetureHasHTTPEndpoints = keaVersion >= 3.0;
|
|
128
|
+
const keaVersion = "3.0.1";
|
|
131
129
|
|
|
132
130
|
export class KeaService extends Service {
|
|
133
131
|
static {
|
|
@@ -148,9 +146,7 @@ export class KeaService extends Service {
|
|
|
148
146
|
}
|
|
149
147
|
|
|
150
148
|
async *preparePackages(dir) {
|
|
151
|
-
const ctrlAgentEndpoint = this.endpoint(
|
|
152
|
-
fetureHasHTTPEndpoints ? "kea-ha-4" : "kea-control-agent"
|
|
153
|
-
);
|
|
149
|
+
const ctrlAgentEndpoint = this.endpoint("kea-ha-4");
|
|
154
150
|
|
|
155
151
|
if (!ctrlAgentEndpoint) {
|
|
156
152
|
return;
|
|
@@ -193,9 +189,7 @@ export class KeaService extends Service {
|
|
|
193
189
|
)
|
|
194
190
|
.sort(sortDescendingByPriority)
|
|
195
191
|
.map((dhcp, i) => {
|
|
196
|
-
const ctrlAgentEndpoint = dhcp.endpoint(
|
|
197
|
-
fetureHasHTTPEndpoints ? `kea-ha-${family}` : "kea-control-agent"
|
|
198
|
-
);
|
|
192
|
+
const ctrlAgentEndpoint = dhcp.endpoint(`kea-ha-${family}`);
|
|
199
193
|
|
|
200
194
|
if (ctrlAgentEndpoint) {
|
|
201
195
|
return {
|
package/types/services/kea.d.mts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
export const fetureHasHTTPEndpoints: boolean;
|
|
2
1
|
export class KeaService extends Service {
|
|
3
2
|
static get typeDefinition(): {
|
|
4
3
|
name: string;
|
|
@@ -462,10 +461,10 @@ export class KeaService extends Service {
|
|
|
462
461
|
env?: string[] | string;
|
|
463
462
|
};
|
|
464
463
|
"ddns-conflict-resolution-mode": {
|
|
465
|
-
writable: boolean;
|
|
466
464
|
isCommonOption: boolean;
|
|
467
465
|
type: string;
|
|
468
466
|
isKey: boolean;
|
|
467
|
+
writable: boolean;
|
|
469
468
|
mandatory: boolean;
|
|
470
469
|
collection: boolean;
|
|
471
470
|
private?: boolean;
|