pmcf 2.55.0 → 2.57.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.
Files changed (14) hide show
  1. package/bin/pmcf-package +1 -2
  2. package/package.json +1 -1
  3. package/src/base.mjs +1 -0
  4. package/src/module.mjs +2 -0
  5. package/src/owner.mjs +17 -5
  6. package/src/service.mjs +1 -2
  7. package/src/services/kea.mjs +18 -11
  8. package/src/services/systemd-journal-remote.mjs +42 -0
  9. package/src/services/systemd-journal-upload.mjs +44 -0
  10. package/types/base.d.mts +1 -1
  11. package/types/module.d.mts +2 -0
  12. package/types/owner.d.mts +1 -0
  13. package/types/services/systemd-journal-remote.d.mts +254 -0
  14. package/types/services/systemd-journal-upload.d.mts +256 -0
package/bin/pmcf-package CHANGED
@@ -30,8 +30,7 @@ const publishingDetails = createPublishingDetails(
30
30
  env
31
31
  );
32
32
 
33
- for (const name of args) {
34
- const object = await root.load(name);
33
+ for (const object of root.find(args)) {
35
34
  const stagingDir = join(options.output, object.fullName);
36
35
 
37
36
  for await (const { sources, outputs, properties } of object.preparePackages(
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pmcf",
3
- "version": "2.55.0",
3
+ "version": "2.57.0",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
package/src/base.mjs CHANGED
@@ -509,6 +509,7 @@ export class Base {
509
509
  traverse(visitor, ...args) {
510
510
  const visited = new Set();
511
511
  this._traverse(visited, visitor, ...args);
512
+ return visited;
512
513
  }
513
514
 
514
515
  _traverse(visited, visitor, ...args) {
package/src/module.mjs CHANGED
@@ -21,6 +21,8 @@ export * from "./services/bind.mjs";
21
21
  export * from "./services/chrony.mjs";
22
22
  export * from "./services/kea.mjs";
23
23
  export * from "./services/systemd-journal.mjs";
24
+ export * from "./services/systemd-journal-remote.mjs";
25
+ export * from "./services/systemd-journal-upload.mjs";
24
26
  export * from "./services/systemd-timesyncd.mjs";
25
27
  export * from "./services/systemd-resolved.mjs";
26
28
  export * from "./types.mjs";
package/src/owner.mjs CHANGED
@@ -3,6 +3,7 @@ import { asIterator } from "./utils.mjs";
3
3
  import { Base } from "./base.mjs";
4
4
  import { Subnet, SUBNET_GLOBAL_IPV4, SUBNET_GLOBAL_IPV6 } from "./subnet.mjs";
5
5
  import { addType, types } from "./types.mjs";
6
+
6
7
  const OwnerTypeDefinition = {
7
8
  name: "owner",
8
9
  owners: ["location", "owner", "root"],
@@ -57,6 +58,17 @@ export class Owner extends Base {
57
58
  return false;
58
59
  }
59
60
 
61
+ *find(pattern) {
62
+ for (const node of this.traverse(() => {})) {
63
+ for (const p of pattern) {
64
+ if (node.fullName.match(p)) {
65
+ yield node;
66
+ break;
67
+ }
68
+ }
69
+ }
70
+ }
71
+
60
72
  named(name) {
61
73
  if (name[0] === "/") {
62
74
  name = name.substring(this.fullName.length + 1);
@@ -185,9 +197,10 @@ export class Owner extends Base {
185
197
  }
186
198
 
187
199
  let subnet = this.subnetForAddress(address);
188
-
200
+
189
201
  if (!subnet) {
190
- subnet = familyIP(address) === 'IPv4' ? SUBNET_GLOBAL_IPV4 : SUBNET_GLOBAL_IPV6;
202
+ subnet =
203
+ familyIP(address) === "IPv4" ? SUBNET_GLOBAL_IPV4 : SUBNET_GLOBAL_IPV6;
191
204
 
192
205
  /*
193
206
  this.error(
@@ -196,7 +209,7 @@ export class Owner extends Base {
196
209
  );
197
210
  */
198
211
  }
199
-
212
+
200
213
  return subnet;
201
214
  }
202
215
 
@@ -216,8 +229,7 @@ export class Owner extends Base {
216
229
  return this.typeList("cluster");
217
230
  }
218
231
 
219
- get bridges()
220
- {
232
+ get bridges() {
221
233
  return this._bridges;
222
234
  }
223
235
 
package/src/service.mjs CHANGED
@@ -13,8 +13,7 @@ const ServiceTypes = {
13
13
  "pacman-repo": {
14
14
  extends: ["https"]
15
15
  },
16
- ntp: { endpoints: [{ protocol: "udp", port: 123, tls: false, isPool: false }] },
17
- //bind: { extends: ["dns"] },
16
+ ntp: { endpoints: [{ protocol: "udp", port: 123, tls: false }] },
18
17
  dns: { endpoints: [{ protocol: "udp", port: 53, tls: false }] },
19
18
  ldap: { endpoints: [{ protocol: "tcp", port: 389, tls: false }] },
20
19
  ldaps: { endpoints: [{ protocol: "tcp", port: 636, tls: true }] },
package/src/services/kea.mjs CHANGED
@@ -125,6 +125,14 @@ export class KeaService extends Service {
125
125
  }
126
126
 
127
127
  async *preparePackages(dir) {
128
+ const ctrlAgentEndpoint = this.endpoint(
129
+ e => e.type === "kea-control-agent"
130
+ );
131
+
132
+ if (!ctrlAgentEndpoint) {
133
+ return;
134
+ }
135
+
128
136
  const network = this.network;
129
137
  const host = this.host;
130
138
  const name = host.name;
@@ -151,10 +159,6 @@ export class KeaService extends Service {
151
159
  }
152
160
  };
153
161
 
154
- const ctrlAgentEndpoint = this.endpoint(
155
- e => e.type === "kea-control-agent"
156
- );
157
-
158
162
  const peers = async family =>
159
163
  (
160
164
  await Array.fromAsync(
@@ -171,13 +175,16 @@ export class KeaService extends Service {
171
175
  : "kea-control-agent")
172
176
  );
173
177
 
174
- return {
175
- name: dhcp.host.name,
176
- role: i === 0 ? "primary" : i > 1 ? "backup" : "standby",
177
- url: ctrlAgentEndpoint.url,
178
- "auto-failover": i <= 1
179
- };
180
- });
178
+ if (ctrlAgentEndpoint) {
179
+ return {
180
+ name: dhcp.host.name,
181
+ role: i === 0 ? "primary" : i > 1 ? "backup" : "standby",
182
+ url: ctrlAgentEndpoint.url,
183
+ "auto-failover": i <= 1
184
+ };
185
+ }
186
+ })
187
+ .filter(p => p != null);
181
188
 
182
189
  const loggers = [
183
190
  {
package/src/services/systemd-journal-remote.mjs ADDED
@@ -0,0 +1,42 @@
1
+ import { Service, ServiceTypeDefinition } from "pmcf";
2
+ import { addType } from "../types.mjs";
3
+
4
+ const SystemdJournalRemoteServiceTypeDefinition = {
5
+ name: "systemd-journal-remote",
6
+ specializationOf: ServiceTypeDefinition,
7
+ owners: ServiceTypeDefinition.owners,
8
+ extends: ServiceTypeDefinition,
9
+ priority: 0.1,
10
+ properties: {}
11
+ };
12
+
13
+ export class SystemdJournalRemoteService extends Service {
14
+ static {
15
+ addType(this);
16
+ }
17
+
18
+ static get typeDefinition() {
19
+ return SystemdJournalRemoteServiceTypeDefinition;
20
+ }
21
+
22
+ constructor(owner, data) {
23
+ super(owner, data);
24
+ this.read(data, SystemdJournalRemoteServiceTypeDefinition);
25
+ }
26
+
27
+ get type() {
28
+ return SystemdJournalRemoteServiceTypeDefinition.name;
29
+ }
30
+
31
+ get systemdServices() {
32
+ return SystemdJournalRemoteServiceTypeDefinition.name;
33
+ }
34
+
35
+ systemdConfig(name) {
36
+ return {
37
+ serviceName: "systemd-journal-remote",
38
+ configFileName: `etc/systemd/journal-remote.conf.d/${name}.conf`,
39
+ content: ["Remote", {}]
40
+ };
41
+ }
42
+ }
package/src/services/systemd-journal-upload.mjs ADDED
@@ -0,0 +1,44 @@
1
+ import { Service, ServiceTypeDefinition } from "pmcf";
2
+ import { addType } from "../types.mjs";
3
+
4
+ const SystemdJournalUploadServiceTypeDefinition = {
5
+ name: "systemd-journal-upload",
6
+ specializationOf: ServiceTypeDefinition,
7
+ owners: ServiceTypeDefinition.owners,
8
+ extends: ServiceTypeDefinition,
9
+ priority: 0.1,
10
+ properties: {}
11
+ };
12
+
13
+ export class SystemdJournalUploadService extends Service {
14
+ static {
15
+ addType(this);
16
+ }
17
+
18
+ static get typeDefinition() {
19
+ return SystemdJournalUploadServiceTypeDefinition;
20
+ }
21
+
22
+ constructor(owner, data) {
23
+ super(owner, data);
24
+ this.read(data, SystemdJournalUploadServiceTypeDefinition);
25
+ }
26
+
27
+ get type() {
28
+ return SystemdJournalUploadServiceTypeDefinition.name;
29
+ }
30
+
31
+ get systemdServices() {
32
+ return SystemdJournalUploadServiceTypeDefinition.name;
33
+ }
34
+
35
+ systemdConfig(name) {
36
+ return {
37
+ serviceName: "systemd-journal-upload",
38
+ configFileName: `etc/systemd/journal-upload.conf.d/${name}.conf`,
39
+ content: ["Upload", {
40
+ URL : ""
41
+ }]
42
+ };
43
+ }
44
+ }
package/types/base.d.mts CHANGED
@@ -109,7 +109,7 @@ export class Base {
109
109
  finalize(action: any): void;
110
110
  execFinalize(): void;
111
111
  _execFinalize(): void;
112
- traverse(visitor: any, ...args: any[]): void;
112
+ traverse(visitor: any, ...args: any[]): Set<any>;
113
113
  _traverse(visited: any, visitor: any, ...args: any[]): boolean;
114
114
  error(...args: any[]): void;
115
115
  info(...args: any[]): void;
package/types/module.d.mts CHANGED
@@ -21,6 +21,8 @@ export * from "./services/bind.mjs";
21
21
  export * from "./services/chrony.mjs";
22
22
  export * from "./services/kea.mjs";
23
23
  export * from "./services/systemd-journal.mjs";
24
+ export * from "./services/systemd-journal-remote.mjs";
25
+ export * from "./services/systemd-journal-upload.mjs";
24
26
  export * from "./services/systemd-timesyncd.mjs";
25
27
  export * from "./services/systemd-resolved.mjs";
26
28
  export * from "./types.mjs";
package/types/owner.d.mts CHANGED
@@ -134,6 +134,7 @@ export class Owner extends Base {
134
134
  _membersByType: Map<any, any>;
135
135
  _bridges: Set<any>;
136
136
  _traverse(...args: any[]): boolean;
137
+ find(pattern: any): Generator<any, void, unknown>;
137
138
  named(name: any): any;
138
139
  typeObject(typeName: any): any;
139
140
  typeList(typeName: any): any;
package/types/services/systemd-journal-remote.d.mts ADDED
@@ -0,0 +1,254 @@
1
+ export class SystemdJournalRemoteService extends Service {
2
+ static get typeDefinition(): {
3
+ name: string;
4
+ specializationOf: {
5
+ name: string;
6
+ owners: string[];
7
+ priority: number;
8
+ extends: {
9
+ name: string;
10
+ owners: any[];
11
+ properties: {
12
+ owner: {
13
+ type: string;
14
+ collection: boolean;
15
+ writeable: boolean;
16
+ };
17
+ type: {
18
+ type: string;
19
+ collection: boolean;
20
+ writeable: boolean;
21
+ };
22
+ name: {
23
+ type: string;
24
+ collection: boolean;
25
+ identifier: boolean;
26
+ writeable: boolean;
27
+ };
28
+ description: {
29
+ type: string;
30
+ collection: boolean;
31
+ writeable: boolean;
32
+ };
33
+ priority: {
34
+ type: string;
35
+ collection: boolean;
36
+ writeable: boolean;
37
+ };
38
+ directory: {
39
+ type: string;
40
+ collection: boolean;
41
+ writeable: boolean;
42
+ };
43
+ packaging: {
44
+ type: string;
45
+ collection: boolean;
46
+ writeable: boolean;
47
+ };
48
+ tags: {
49
+ type: string;
50
+ collection: boolean;
51
+ writeable: boolean;
52
+ };
53
+ };
54
+ };
55
+ specializations: {};
56
+ factoryFor(owner: any, value: any): any;
57
+ properties: {
58
+ alias: {
59
+ type: string;
60
+ collection: boolean;
61
+ writeable: boolean;
62
+ };
63
+ weight: {
64
+ type: string;
65
+ collection: boolean;
66
+ writeable: boolean;
67
+ default: number;
68
+ };
69
+ systemd: {
70
+ type: string;
71
+ collection: boolean;
72
+ writeable: boolean;
73
+ };
74
+ port: {
75
+ type: string;
76
+ collection: boolean;
77
+ writeable: boolean;
78
+ };
79
+ protocol: {
80
+ type: string;
81
+ collection: boolean;
82
+ writeable: boolean;
83
+ values: string[];
84
+ };
85
+ type: {
86
+ type: string;
87
+ collection: boolean;
88
+ writeable: boolean;
89
+ };
90
+ tls: {
91
+ type: string;
92
+ collection: boolean;
93
+ writeable: boolean;
94
+ default: boolean;
95
+ };
96
+ hostName: {
97
+ type: string;
98
+ collection: boolean;
99
+ writeable: boolean;
100
+ };
101
+ cidrAddresses: {
102
+ type: string;
103
+ collection: boolean;
104
+ writeable: boolean;
105
+ };
106
+ cidrAddress: {
107
+ type: string;
108
+ collection: boolean;
109
+ writeable: boolean;
110
+ };
111
+ addresses: {
112
+ type: string;
113
+ collection: boolean;
114
+ writeable: boolean;
115
+ };
116
+ address: {
117
+ type: string;
118
+ collection: boolean;
119
+ writeable: boolean;
120
+ };
121
+ };
122
+ };
123
+ owners: string[];
124
+ extends: {
125
+ name: string;
126
+ owners: string[];
127
+ priority: number;
128
+ extends: {
129
+ name: string;
130
+ owners: any[];
131
+ properties: {
132
+ owner: {
133
+ type: string;
134
+ collection: boolean;
135
+ writeable: boolean;
136
+ };
137
+ type: {
138
+ type: string;
139
+ collection: boolean;
140
+ writeable: boolean;
141
+ };
142
+ name: {
143
+ type: string;
144
+ collection: boolean;
145
+ identifier: boolean;
146
+ writeable: boolean;
147
+ };
148
+ description: {
149
+ type: string;
150
+ collection: boolean;
151
+ writeable: boolean;
152
+ };
153
+ priority: {
154
+ type: string;
155
+ collection: boolean;
156
+ writeable: boolean;
157
+ };
158
+ directory: {
159
+ type: string;
160
+ collection: boolean;
161
+ writeable: boolean;
162
+ };
163
+ packaging: {
164
+ type: string;
165
+ collection: boolean;
166
+ writeable: boolean;
167
+ };
168
+ tags: {
169
+ type: string;
170
+ collection: boolean;
171
+ writeable: boolean;
172
+ };
173
+ };
174
+ };
175
+ specializations: {};
176
+ factoryFor(owner: any, value: any): any;
177
+ properties: {
178
+ alias: {
179
+ type: string;
180
+ collection: boolean;
181
+ writeable: boolean;
182
+ };
183
+ weight: {
184
+ type: string;
185
+ collection: boolean;
186
+ writeable: boolean;
187
+ default: number;
188
+ };
189
+ systemd: {
190
+ type: string;
191
+ collection: boolean;
192
+ writeable: boolean;
193
+ };
194
+ port: {
195
+ type: string;
196
+ collection: boolean;
197
+ writeable: boolean;
198
+ };
199
+ protocol: {
200
+ type: string;
201
+ collection: boolean;
202
+ writeable: boolean;
203
+ values: string[];
204
+ };
205
+ type: {
206
+ type: string;
207
+ collection: boolean;
208
+ writeable: boolean;
209
+ };
210
+ tls: {
211
+ type: string;
212
+ collection: boolean;
213
+ writeable: boolean;
214
+ default: boolean;
215
+ };
216
+ hostName: {
217
+ type: string;
218
+ collection: boolean;
219
+ writeable: boolean;
220
+ };
221
+ cidrAddresses: {
222
+ type: string;
223
+ collection: boolean;
224
+ writeable: boolean;
225
+ };
226
+ cidrAddress: {
227
+ type: string;
228
+ collection: boolean;
229
+ writeable: boolean;
230
+ };
231
+ addresses: {
232
+ type: string;
233
+ collection: boolean;
234
+ writeable: boolean;
235
+ };
236
+ address: {
237
+ type: string;
238
+ collection: boolean;
239
+ writeable: boolean;
240
+ };
241
+ };
242
+ };
243
+ priority: number;
244
+ properties: {};
245
+ };
246
+ get type(): string;
247
+ get systemdServices(): string;
248
+ systemdConfig(name: any): {
249
+ serviceName: string;
250
+ configFileName: string;
251
+ content: {}[];
252
+ };
253
+ }
254
+ import { Service } from "pmcf";
package/types/services/systemd-journal-upload.d.mts ADDED
@@ -0,0 +1,256 @@
1
+ export class SystemdJournalUploadService extends Service {
2
+ static get typeDefinition(): {
3
+ name: string;
4
+ specializationOf: {
5
+ name: string;
6
+ owners: string[];
7
+ priority: number;
8
+ extends: {
9
+ name: string;
10
+ owners: any[];
11
+ properties: {
12
+ owner: {
13
+ type: string;
14
+ collection: boolean;
15
+ writeable: boolean;
16
+ };
17
+ type: {
18
+ type: string;
19
+ collection: boolean;
20
+ writeable: boolean;
21
+ };
22
+ name: {
23
+ type: string;
24
+ collection: boolean;
25
+ identifier: boolean;
26
+ writeable: boolean;
27
+ };
28
+ description: {
29
+ type: string;
30
+ collection: boolean;
31
+ writeable: boolean;
32
+ };
33
+ priority: {
34
+ type: string;
35
+ collection: boolean;
36
+ writeable: boolean;
37
+ };
38
+ directory: {
39
+ type: string;
40
+ collection: boolean;
41
+ writeable: boolean;
42
+ };
43
+ packaging: {
44
+ type: string;
45
+ collection: boolean;
46
+ writeable: boolean;
47
+ };
48
+ tags: {
49
+ type: string;
50
+ collection: boolean;
51
+ writeable: boolean;
52
+ };
53
+ };
54
+ };
55
+ specializations: {};
56
+ factoryFor(owner: any, value: any): any;
57
+ properties: {
58
+ alias: {
59
+ type: string;
60
+ collection: boolean;
61
+ writeable: boolean;
62
+ };
63
+ weight: {
64
+ type: string;
65
+ collection: boolean;
66
+ writeable: boolean;
67
+ default: number;
68
+ };
69
+ systemd: {
70
+ type: string;
71
+ collection: boolean;
72
+ writeable: boolean;
73
+ };
74
+ port: {
75
+ type: string;
76
+ collection: boolean;
77
+ writeable: boolean;
78
+ };
79
+ protocol: {
80
+ type: string;
81
+ collection: boolean;
82
+ writeable: boolean;
83
+ values: string[];
84
+ };
85
+ type: {
86
+ type: string;
87
+ collection: boolean;
88
+ writeable: boolean;
89
+ };
90
+ tls: {
91
+ type: string;
92
+ collection: boolean;
93
+ writeable: boolean;
94
+ default: boolean;
95
+ };
96
+ hostName: {
97
+ type: string;
98
+ collection: boolean;
99
+ writeable: boolean;
100
+ };
101
+ cidrAddresses: {
102
+ type: string;
103
+ collection: boolean;
104
+ writeable: boolean;
105
+ };
106
+ cidrAddress: {
107
+ type: string;
108
+ collection: boolean;
109
+ writeable: boolean;
110
+ };
111
+ addresses: {
112
+ type: string;
113
+ collection: boolean;
114
+ writeable: boolean;
115
+ };
116
+ address: {
117
+ type: string;
118
+ collection: boolean;
119
+ writeable: boolean;
120
+ };
121
+ };
122
+ };
123
+ owners: string[];
124
+ extends: {
125
+ name: string;
126
+ owners: string[];
127
+ priority: number;
128
+ extends: {
129
+ name: string;
130
+ owners: any[];
131
+ properties: {
132
+ owner: {
133
+ type: string;
134
+ collection: boolean;
135
+ writeable: boolean;
136
+ };
137
+ type: {
138
+ type: string;
139
+ collection: boolean;
140
+ writeable: boolean;
141
+ };
142
+ name: {
143
+ type: string;
144
+ collection: boolean;
145
+ identifier: boolean;
146
+ writeable: boolean;
147
+ };
148
+ description: {
149
+ type: string;
150
+ collection: boolean;
151
+ writeable: boolean;
152
+ };
153
+ priority: {
154
+ type: string;
155
+ collection: boolean;
156
+ writeable: boolean;
157
+ };
158
+ directory: {
159
+ type: string;
160
+ collection: boolean;
161
+ writeable: boolean;
162
+ };
163
+ packaging: {
164
+ type: string;
165
+ collection: boolean;
166
+ writeable: boolean;
167
+ };
168
+ tags: {
169
+ type: string;
170
+ collection: boolean;
171
+ writeable: boolean;
172
+ };
173
+ };
174
+ };
175
+ specializations: {};
176
+ factoryFor(owner: any, value: any): any;
177
+ properties: {
178
+ alias: {
179
+ type: string;
180
+ collection: boolean;
181
+ writeable: boolean;
182
+ };
183
+ weight: {
184
+ type: string;
185
+ collection: boolean;
186
+ writeable: boolean;
187
+ default: number;
188
+ };
189
+ systemd: {
190
+ type: string;
191
+ collection: boolean;
192
+ writeable: boolean;
193
+ };
194
+ port: {
195
+ type: string;
196
+ collection: boolean;
197
+ writeable: boolean;
198
+ };
199
+ protocol: {
200
+ type: string;
201
+ collection: boolean;
202
+ writeable: boolean;
203
+ values: string[];
204
+ };
205
+ type: {
206
+ type: string;
207
+ collection: boolean;
208
+ writeable: boolean;
209
+ };
210
+ tls: {
211
+ type: string;
212
+ collection: boolean;
213
+ writeable: boolean;
214
+ default: boolean;
215
+ };
216
+ hostName: {
217
+ type: string;
218
+ collection: boolean;
219
+ writeable: boolean;
220
+ };
221
+ cidrAddresses: {
222
+ type: string;
223
+ collection: boolean;
224
+ writeable: boolean;
225
+ };
226
+ cidrAddress: {
227
+ type: string;
228
+ collection: boolean;
229
+ writeable: boolean;
230
+ };
231
+ addresses: {
232
+ type: string;
233
+ collection: boolean;
234
+ writeable: boolean;
235
+ };
236
+ address: {
237
+ type: string;
238
+ collection: boolean;
239
+ writeable: boolean;
240
+ };
241
+ };
242
+ };
243
+ priority: number;
244
+ properties: {};
245
+ };
246
+ get type(): string;
247
+ get systemdServices(): string;
248
+ systemdConfig(name: any): {
249
+ serviceName: string;
250
+ configFileName: string;
251
+ content: (string | {
252
+ URL: string;
253
+ })[];
254
+ };
255
+ }
256
+ import { Service } from "pmcf";