pmcf 2.35.2 → 2.35.4
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/service.mjs +2 -16
- package/src/services/dns.mjs +2 -2
- package/types/extra-source-service.d.mts +0 -5
- package/types/service.d.mts +1 -15
- package/types/services/dhcp.d.mts +0 -10
- package/types/services/dns.d.mts +0 -10
- package/types/services/ntp.d.mts +0 -10
- package/types/services/systemd-journal.d.mts +0 -10
- package/types/services/systemd-resolved.d.mts +2 -12
- package/types/services/systemd-timesyncd.d.mts +1 -11
package/package.json
CHANGED
package/src/service.mjs
CHANGED
|
@@ -106,7 +106,6 @@ export const ServiceTypeDefinition = {
|
|
|
106
106
|
properties: {
|
|
107
107
|
...networkAddressProperties,
|
|
108
108
|
...endpointProperties,
|
|
109
|
-
ipAddresses: { type: "string", collection: true, writeable: true },
|
|
110
109
|
alias: { type: "string", collection: false, writeable: true },
|
|
111
110
|
weight: { type: "number", collection: false, writeable: true, default: 1 },
|
|
112
111
|
systemd: { type: "string", collection: true, writeable: true }
|
|
@@ -118,7 +117,6 @@ export class Service extends Base {
|
|
|
118
117
|
_weight;
|
|
119
118
|
_type;
|
|
120
119
|
_port;
|
|
121
|
-
_ipAddresses;
|
|
122
120
|
_systemd;
|
|
123
121
|
_extends = [];
|
|
124
122
|
|
|
@@ -165,18 +163,6 @@ export class Service extends Base {
|
|
|
165
163
|
return this.address ?? this.domainName;
|
|
166
164
|
}
|
|
167
165
|
|
|
168
|
-
get addresses() {
|
|
169
|
-
return this._ipAddresses ?? this.owner.addresses;
|
|
170
|
-
}
|
|
171
|
-
|
|
172
|
-
get address() {
|
|
173
|
-
return this._ipAddresses?.[0] ?? this.host.address;
|
|
174
|
-
}
|
|
175
|
-
|
|
176
|
-
set ipAddresses(value) {
|
|
177
|
-
this._ipAddresses = value;
|
|
178
|
-
}
|
|
179
|
-
|
|
180
166
|
get networks() {
|
|
181
167
|
return this.host.networks;
|
|
182
168
|
}
|
|
@@ -330,7 +316,7 @@ export function serviceEndpoints(sources, options = {}) {
|
|
|
330
316
|
.map(service => service.endpoints(options.endpoints))
|
|
331
317
|
.flat();
|
|
332
318
|
|
|
333
|
-
const res = new Set(options.select ? all.map(options.select) : all);
|
|
319
|
+
const res = [...new Set(options.select ? all.map(options.select) : all)];
|
|
334
320
|
|
|
335
|
-
return options.join ?
|
|
321
|
+
return options.join ? res.join(options.join) : res;
|
|
336
322
|
}
|
package/src/services/dns.mjs
CHANGED
|
@@ -214,7 +214,7 @@ export class DNSService extends ExtraSourceService {
|
|
|
214
214
|
select: e => e.address
|
|
215
215
|
});
|
|
216
216
|
|
|
217
|
-
if (forwarders.
|
|
217
|
+
if (forwarders.length) {
|
|
218
218
|
await writeLines(
|
|
219
219
|
join(p1, "etc/named/options"),
|
|
220
220
|
`forwarders.conf`,
|
|
@@ -234,7 +234,7 @@ export class DNSService extends ExtraSourceService {
|
|
|
234
234
|
if (acls.length) {
|
|
235
235
|
await writeLines(join(p1, "etc/named"), `0-acl-${name}.conf`, acls);
|
|
236
236
|
}
|
|
237
|
-
if (forwarders.
|
|
237
|
+
if (forwarders.length || acls.length) {
|
|
238
238
|
yield packageData;
|
|
239
239
|
}
|
|
240
240
|
|
|
@@ -69,11 +69,6 @@ export class ExtraSourceService extends Service {
|
|
|
69
69
|
specializations: {};
|
|
70
70
|
factoryFor(owner: any, value: any): any;
|
|
71
71
|
properties: {
|
|
72
|
-
ipAddresses: {
|
|
73
|
-
type: string;
|
|
74
|
-
collection: boolean;
|
|
75
|
-
writeable: boolean;
|
|
76
|
-
};
|
|
77
72
|
alias: {
|
|
78
73
|
type: string;
|
|
79
74
|
collection: boolean;
|
package/types/service.d.mts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export function serviceEndpoints(sources: any, options?: {}): string |
|
|
1
|
+
export function serviceEndpoints(sources: any, options?: {}): string | any[];
|
|
2
2
|
export namespace endpointProperties {
|
|
3
3
|
export namespace port {
|
|
4
4
|
let type: string;
|
|
@@ -100,11 +100,6 @@ export namespace ServiceTypeDefinition {
|
|
|
100
100
|
export { specializations_1 as specializations };
|
|
101
101
|
export function factoryFor(owner: any, value: any): any;
|
|
102
102
|
export let properties: {
|
|
103
|
-
ipAddresses: {
|
|
104
|
-
type: string;
|
|
105
|
-
collection: boolean;
|
|
106
|
-
writeable: boolean;
|
|
107
|
-
};
|
|
108
103
|
alias: {
|
|
109
104
|
type: string;
|
|
110
105
|
collection: boolean;
|
|
@@ -225,11 +220,6 @@ export class Service extends Base {
|
|
|
225
220
|
specializations: {};
|
|
226
221
|
factoryFor(owner: any, value: any): any;
|
|
227
222
|
properties: {
|
|
228
|
-
ipAddresses: {
|
|
229
|
-
type: string;
|
|
230
|
-
collection: boolean;
|
|
231
|
-
writeable: boolean;
|
|
232
|
-
};
|
|
233
223
|
alias: {
|
|
234
224
|
type: string;
|
|
235
225
|
collection: boolean;
|
|
@@ -299,7 +289,6 @@ export class Service extends Base {
|
|
|
299
289
|
_weight: any;
|
|
300
290
|
_type: any;
|
|
301
291
|
_port: any;
|
|
302
|
-
_ipAddresses: any;
|
|
303
292
|
_systemd: any;
|
|
304
293
|
_extends: any[];
|
|
305
294
|
set extends(value: any[]);
|
|
@@ -308,9 +297,6 @@ export class Service extends Base {
|
|
|
308
297
|
hosts(): Generator<any, void, any>;
|
|
309
298
|
get domainName(): any;
|
|
310
299
|
get ipAddressOrDomainName(): any;
|
|
311
|
-
get addresses(): any;
|
|
312
|
-
get address(): any;
|
|
313
|
-
set ipAddresses(value: any);
|
|
314
300
|
get networks(): Set<any>;
|
|
315
301
|
endpoints(filter: any): any[];
|
|
316
302
|
set alias(value: any);
|
|
@@ -55,11 +55,6 @@ export class DHCPService extends Service {
|
|
|
55
55
|
specializations: {};
|
|
56
56
|
factoryFor(owner: any, value: any): any;
|
|
57
57
|
properties: {
|
|
58
|
-
ipAddresses: {
|
|
59
|
-
type: string;
|
|
60
|
-
collection: boolean;
|
|
61
|
-
writeable: boolean;
|
|
62
|
-
};
|
|
63
58
|
alias: {
|
|
64
59
|
type: string;
|
|
65
60
|
collection: boolean;
|
|
@@ -180,11 +175,6 @@ export class DHCPService extends Service {
|
|
|
180
175
|
specializations: {};
|
|
181
176
|
factoryFor(owner: any, value: any): any;
|
|
182
177
|
properties: {
|
|
183
|
-
ipAddresses: {
|
|
184
|
-
type: string;
|
|
185
|
-
collection: boolean;
|
|
186
|
-
writeable: boolean;
|
|
187
|
-
};
|
|
188
178
|
alias: {
|
|
189
179
|
type: string;
|
|
190
180
|
collection: boolean;
|
package/types/services/dns.d.mts
CHANGED
|
@@ -55,11 +55,6 @@ export class DNSService extends ExtraSourceService {
|
|
|
55
55
|
specializations: {};
|
|
56
56
|
factoryFor(owner: any, value: any): any;
|
|
57
57
|
properties: {
|
|
58
|
-
ipAddresses: {
|
|
59
|
-
type: string;
|
|
60
|
-
collection: boolean;
|
|
61
|
-
writeable: boolean;
|
|
62
|
-
};
|
|
63
58
|
alias: {
|
|
64
59
|
type: string;
|
|
65
60
|
collection: boolean;
|
|
@@ -183,11 +178,6 @@ export class DNSService extends ExtraSourceService {
|
|
|
183
178
|
specializations: {};
|
|
184
179
|
factoryFor(owner: any, value: any): any;
|
|
185
180
|
properties: {
|
|
186
|
-
ipAddresses: {
|
|
187
|
-
type: string;
|
|
188
|
-
collection: boolean;
|
|
189
|
-
writeable: boolean;
|
|
190
|
-
};
|
|
191
181
|
alias: {
|
|
192
182
|
type: string;
|
|
193
183
|
collection: boolean;
|
package/types/services/ntp.d.mts
CHANGED
|
@@ -55,11 +55,6 @@ export class NTPService extends ExtraSourceService {
|
|
|
55
55
|
specializations: {};
|
|
56
56
|
factoryFor(owner: any, value: any): any;
|
|
57
57
|
properties: {
|
|
58
|
-
ipAddresses: {
|
|
59
|
-
type: string;
|
|
60
|
-
collection: boolean;
|
|
61
|
-
writeable: boolean;
|
|
62
|
-
};
|
|
63
58
|
alias: {
|
|
64
59
|
type: string;
|
|
65
60
|
collection: boolean;
|
|
@@ -183,11 +178,6 @@ export class NTPService extends ExtraSourceService {
|
|
|
183
178
|
specializations: {};
|
|
184
179
|
factoryFor(owner: any, value: any): any;
|
|
185
180
|
properties: {
|
|
186
|
-
ipAddresses: {
|
|
187
|
-
type: string;
|
|
188
|
-
collection: boolean;
|
|
189
|
-
writeable: boolean;
|
|
190
|
-
};
|
|
191
181
|
alias: {
|
|
192
182
|
type: string;
|
|
193
183
|
collection: boolean;
|
|
@@ -55,11 +55,6 @@ export class SystemdJournalService extends Service {
|
|
|
55
55
|
specializations: {};
|
|
56
56
|
factoryFor(owner: any, value: any): any;
|
|
57
57
|
properties: {
|
|
58
|
-
ipAddresses: {
|
|
59
|
-
type: string;
|
|
60
|
-
collection: boolean;
|
|
61
|
-
writeable: boolean;
|
|
62
|
-
};
|
|
63
58
|
alias: {
|
|
64
59
|
type: string;
|
|
65
60
|
collection: boolean;
|
|
@@ -180,11 +175,6 @@ export class SystemdJournalService extends Service {
|
|
|
180
175
|
specializations: {};
|
|
181
176
|
factoryFor(owner: any, value: any): any;
|
|
182
177
|
properties: {
|
|
183
|
-
ipAddresses: {
|
|
184
|
-
type: string;
|
|
185
|
-
collection: boolean;
|
|
186
|
-
writeable: boolean;
|
|
187
|
-
};
|
|
188
178
|
alias: {
|
|
189
179
|
type: string;
|
|
190
180
|
collection: boolean;
|
|
@@ -55,11 +55,6 @@ export class SystemdResolvedService extends ExtraSourceService {
|
|
|
55
55
|
specializations: {};
|
|
56
56
|
factoryFor(owner: any, value: any): any;
|
|
57
57
|
properties: {
|
|
58
|
-
ipAddresses: {
|
|
59
|
-
type: string;
|
|
60
|
-
collection: boolean;
|
|
61
|
-
writeable: boolean;
|
|
62
|
-
};
|
|
63
58
|
alias: {
|
|
64
59
|
type: string;
|
|
65
60
|
collection: boolean;
|
|
@@ -180,11 +175,6 @@ export class SystemdResolvedService extends ExtraSourceService {
|
|
|
180
175
|
specializations: {};
|
|
181
176
|
factoryFor(owner: any, value: any): any;
|
|
182
177
|
properties: {
|
|
183
|
-
ipAddresses: {
|
|
184
|
-
type: string;
|
|
185
|
-
collection: boolean;
|
|
186
|
-
writeable: boolean;
|
|
187
|
-
};
|
|
188
178
|
alias: {
|
|
189
179
|
type: string;
|
|
190
180
|
collection: boolean;
|
|
@@ -257,8 +247,8 @@ export class SystemdResolvedService extends ExtraSourceService {
|
|
|
257
247
|
systemdConfig(name: any): {
|
|
258
248
|
name: string;
|
|
259
249
|
content: (string | {
|
|
260
|
-
DNS: string |
|
|
261
|
-
FallbackDNS: string |
|
|
250
|
+
DNS: string | any[];
|
|
251
|
+
FallbackDNS: string | any[];
|
|
262
252
|
Domains: string;
|
|
263
253
|
DNSSEC: string;
|
|
264
254
|
MulticastDNS: string;
|
|
@@ -55,11 +55,6 @@ export class SystemdTimesyncdService extends ExtraSourceService {
|
|
|
55
55
|
specializations: {};
|
|
56
56
|
factoryFor(owner: any, value: any): any;
|
|
57
57
|
properties: {
|
|
58
|
-
ipAddresses: {
|
|
59
|
-
type: string;
|
|
60
|
-
collection: boolean;
|
|
61
|
-
writeable: boolean;
|
|
62
|
-
};
|
|
63
58
|
alias: {
|
|
64
59
|
type: string;
|
|
65
60
|
collection: boolean;
|
|
@@ -180,11 +175,6 @@ export class SystemdTimesyncdService extends ExtraSourceService {
|
|
|
180
175
|
specializations: {};
|
|
181
176
|
factoryFor(owner: any, value: any): any;
|
|
182
177
|
properties: {
|
|
183
|
-
ipAddresses: {
|
|
184
|
-
type: string;
|
|
185
|
-
collection: boolean;
|
|
186
|
-
writeable: boolean;
|
|
187
|
-
};
|
|
188
178
|
alias: {
|
|
189
179
|
type: string;
|
|
190
180
|
collection: boolean;
|
|
@@ -257,7 +247,7 @@ export class SystemdTimesyncdService extends ExtraSourceService {
|
|
|
257
247
|
systemdConfig(name: any): {
|
|
258
248
|
name: string;
|
|
259
249
|
content: (string | {
|
|
260
|
-
NTP: string |
|
|
250
|
+
NTP: string | any[];
|
|
261
251
|
})[];
|
|
262
252
|
};
|
|
263
253
|
}
|