pmcf 2.45.0 → 2.46.1
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 +3 -3
- package/src/cluster.mjs +1 -2
- package/src/host.mjs +14 -0
- package/types/cluster.d.mts +5 -1
- package/types/host.d.mts +8 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "pmcf",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.46.1",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -35,14 +35,14 @@
|
|
|
35
35
|
},
|
|
36
36
|
"scripts": {
|
|
37
37
|
"prepare": "node --run prepare:typescript",
|
|
38
|
-
"prepare:typescript": "tsc --allowJs --declaration --emitDeclarationOnly --declarationDir types --resolveJsonModule --target
|
|
38
|
+
"prepare:typescript": "tsc --allowJs --declaration --emitDeclarationOnly --declarationDir types --resolveJsonModule --target esnext -m esnext --module nodenext --moduleResolution nodenext --rootDir src ./src**/*.mjs",
|
|
39
39
|
"test": "node --run test:ava",
|
|
40
40
|
"test:ava": "ava --timeout 4m tests/*-ava.mjs tests/*-ava-node.mjs",
|
|
41
41
|
"cover": "c8 -x 'tests/**/*' --temp-directory build/tmp ava --timeout 4m tests/*-ava.mjs tests/*-ava-node.mjs && c8 report -r lcov -o build/coverage --temp-directory build/tmp",
|
|
42
42
|
"docs": "documentation readme --section=API ./src**/*.mjs",
|
|
43
43
|
"lint": "node --run lint:docs && node --run lint:typescript",
|
|
44
44
|
"lint:docs": "documentation lint ./src**/*.mjs",
|
|
45
|
-
"lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target
|
|
45
|
+
"lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
48
|
"ip-utilties": "^1.3.1",
|
package/src/cluster.mjs
CHANGED
|
@@ -81,8 +81,7 @@ export class Cluster extends Host {
|
|
|
81
81
|
name,
|
|
82
82
|
description: `${this.typeName} definitions for ${this.fullName}`,
|
|
83
83
|
access: "private",
|
|
84
|
-
dependencies: ["keepalived>=2.3.3"]
|
|
85
|
-
replaces: [`keepalived-${host.name}`]
|
|
84
|
+
dependencies: ["keepalived>=2.3.3"]
|
|
86
85
|
}
|
|
87
86
|
};
|
|
88
87
|
|
package/src/host.mjs
CHANGED
|
@@ -47,6 +47,7 @@ const HostTypeDefinition = {
|
|
|
47
47
|
weight: { type: "number", collection: false, writeable: true },
|
|
48
48
|
serial: { type: "string", collection: false, writeable: true },
|
|
49
49
|
vendor: { type: "string", collection: false, writeable: true },
|
|
50
|
+
keymap: { type: "string", collection: false, writeable: true },
|
|
50
51
|
chassis: {
|
|
51
52
|
type: "string",
|
|
52
53
|
collection: false,
|
|
@@ -95,6 +96,7 @@ export class Host extends ServiceOwner {
|
|
|
95
96
|
_vendor;
|
|
96
97
|
_architecture;
|
|
97
98
|
_serial;
|
|
99
|
+
_keymap;
|
|
98
100
|
|
|
99
101
|
static {
|
|
100
102
|
addType(this);
|
|
@@ -187,6 +189,14 @@ export class Host extends ServiceOwner {
|
|
|
187
189
|
return this.extendedProperty("_vendor");
|
|
188
190
|
}
|
|
189
191
|
|
|
192
|
+
set keymap(value) {
|
|
193
|
+
this._keymap = value;
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
get keymap() {
|
|
197
|
+
return this.extendedProperty("_keymap");
|
|
198
|
+
}
|
|
199
|
+
|
|
190
200
|
set architecture(value) {
|
|
191
201
|
this._architecture = value;
|
|
192
202
|
}
|
|
@@ -490,6 +500,10 @@ export class Host extends ServiceOwner {
|
|
|
490
500
|
await ni.systemdDefinitions(packageData);
|
|
491
501
|
}
|
|
492
502
|
|
|
503
|
+
if (this.keymap) {
|
|
504
|
+
await writeLines(dir, "etc/vconsole.conf", `KEYMAP=${this.keymap}`);
|
|
505
|
+
}
|
|
506
|
+
|
|
493
507
|
await generateMachineInfo(this, packageData);
|
|
494
508
|
await generateKnownHosts(this.owner.hosts(), join(dir, "root", ".ssh"));
|
|
495
509
|
|
package/types/cluster.d.mts
CHANGED
|
@@ -238,6 +238,11 @@ export class Cluster extends Host {
|
|
|
238
238
|
collection: boolean;
|
|
239
239
|
writeable: boolean;
|
|
240
240
|
};
|
|
241
|
+
keymap: {
|
|
242
|
+
type: string;
|
|
243
|
+
collection: boolean;
|
|
244
|
+
writeable: boolean;
|
|
245
|
+
};
|
|
241
246
|
chassis: {
|
|
242
247
|
type: string;
|
|
243
248
|
collection: boolean;
|
|
@@ -352,7 +357,6 @@ export class Cluster extends Host {
|
|
|
352
357
|
description: string;
|
|
353
358
|
access: string;
|
|
354
359
|
dependencies: string[];
|
|
355
|
-
replaces: string[];
|
|
356
360
|
};
|
|
357
361
|
}, void, unknown>;
|
|
358
362
|
}
|
package/types/host.d.mts
CHANGED
|
@@ -103,6 +103,11 @@ export class Host extends ServiceOwner {
|
|
|
103
103
|
collection: boolean;
|
|
104
104
|
writeable: boolean;
|
|
105
105
|
};
|
|
106
|
+
keymap: {
|
|
107
|
+
type: string;
|
|
108
|
+
collection: boolean;
|
|
109
|
+
writeable: boolean;
|
|
110
|
+
};
|
|
106
111
|
chassis: {
|
|
107
112
|
type: string;
|
|
108
113
|
collection: boolean;
|
|
@@ -185,6 +190,7 @@ export class Host extends ServiceOwner {
|
|
|
185
190
|
_vendor: any;
|
|
186
191
|
_architecture: any;
|
|
187
192
|
_serial: any;
|
|
193
|
+
_keymap: any;
|
|
188
194
|
extra: any;
|
|
189
195
|
_applyExtends(host: any): void;
|
|
190
196
|
set serial(value: any);
|
|
@@ -195,6 +201,8 @@ export class Host extends ServiceOwner {
|
|
|
195
201
|
get chassis(): any;
|
|
196
202
|
set vendor(value: any);
|
|
197
203
|
get vendor(): any;
|
|
204
|
+
set keymap(value: any);
|
|
205
|
+
get keymap(): any;
|
|
198
206
|
set architecture(value: any);
|
|
199
207
|
get architecture(): any;
|
|
200
208
|
get isTemplate(): true | RegExpMatchArray;
|