pmcf 6.44.3 → 6.44.5

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 (4) hide show
  1. package/README.md +48 -24
  2. package/package.json +1 -1
  3. package/src/services/chrony.mjs +12 -3
  4. package/src/services/influxdb.mjs +8 -1
package/README.md CHANGED
@@ -82,40 +82,44 @@ generates config packages for:
82
82
  * [domainNames](#domainnames)
83
83
  * [InitializationContext](#initializationcontext)
84
84
  * [Parameters](#parameters-14)
85
- * [SkeletonNetworkInterface](#skeletonnetworkinterface)
86
- * [networkAddresses](#networkaddresses)
87
- * [Parameters](#parameters-15)
88
85
  * [zones](#zones)
89
86
  * [addressesStatement](#addressesstatement)
90
- * [Parameters](#parameters-16)
87
+ * [Parameters](#parameters-15)
91
88
  * [SystemdJournalRemoteService](#systemdjournalremoteservice)
92
89
  * [Properties](#properties)
93
90
  * [systemdConfigs](#systemdconfigs)
94
- * [Parameters](#parameters-17)
91
+ * [Parameters](#parameters-16)
95
92
  * [SystemdJournalUploadService](#systemdjournaluploadservice)
96
93
  * [Properties](#properties-1)
97
94
  * [systemdConfigs](#systemdconfigs-1)
98
- * [Parameters](#parameters-18)
95
+ * [Parameters](#parameters-17)
99
96
  * [NetworkAddress](#networkaddress)
100
- * [Parameters](#parameters-19)
97
+ * [Parameters](#parameters-18)
101
98
  * [subnet](#subnet)
102
99
  * [networkInterface](#networkinterface)
103
100
  * [address](#address)
104
101
  * [addresses](#addresses)
105
- * [Parameters](#parameters-20)
102
+ * [Parameters](#parameters-19)
106
103
  * [cidrAddresses](#cidraddresses)
107
- * [Parameters](#parameters-21)
104
+ * [Parameters](#parameters-20)
105
+ * [SkeletonNetworkInterface](#skeletonnetworkinterface)
106
+ * [networkAddresses](#networkaddresses)
107
+ * [Parameters](#parameters-21)
108
108
  * [families](#families)
109
109
  * [secretName](#secretname)
110
110
  * [directHosts](#directhosts)
111
111
  * [subnetForAddress](#subnetforaddress)
112
112
  * [Parameters](#parameters-22)
113
- * [domainName](#domainname)
113
+ * [ServiceType](#servicetype)
114
+ * [Properties](#properties-2)
115
+ * [serviceTypeEndpoints](#servicetypeendpoints)
114
116
  * [Parameters](#parameters-23)
115
- * [domainFromDominName](#domainfromdominname)
117
+ * [domainName](#domainname)
116
118
  * [Parameters](#parameters-24)
117
- * [sectionLines](#sectionlines)
119
+ * [domainFromDominName](#domainfromdominname)
118
120
  * [Parameters](#parameters-25)
121
+ * [sectionLines](#sectionlines)
122
+ * [Parameters](#parameters-26)
119
123
 
120
124
  ## base
121
125
 
@@ -308,18 +312,6 @@ Keeps track of all in flight object creations and loose ends during config initi
308
312
 
309
313
  * `directory` (optional, default `"/"`)
310
314
 
311
- ## SkeletonNetworkInterface
312
-
313
- **Extends ServiceOwner**
314
-
315
- ### networkAddresses
316
-
317
- #### Parameters
318
-
319
- * `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** (optional, default `n=>true`)
320
-
321
- Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
322
-
323
315
  ## zones
324
316
 
325
317
  Type: [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)\<bind\_zone>
@@ -410,6 +402,18 @@ Returns **Iterable<[string](https://developer.mozilla.org/docs/Web/JavaScript/Re
410
402
 
411
403
  Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
412
404
 
405
+ ## SkeletonNetworkInterface
406
+
407
+ **Extends ServiceOwner**
408
+
409
+ ### networkAddresses
410
+
411
+ #### Parameters
412
+
413
+ * `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** (optional, default `n=>true`)
414
+
415
+ Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
416
+
413
417
  ## families
414
418
 
415
419
  Returns **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
@@ -430,6 +434,26 @@ hosts we own direcly.
430
434
 
431
435
  Returns **Subnet?**&#x20;
432
436
 
437
+ ## ServiceType
438
+
439
+ Type: [object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)
440
+
441
+ ### Properties
442
+
443
+ * `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
444
+ * `services` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)>**&#x20;
445
+ * `extends` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[ServiceType](#servicetype)>**&#x20;
446
+ * `endpoints` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)>**&#x20;
447
+
448
+ ## serviceTypeEndpoints
449
+
450
+ ### Parameters
451
+
452
+ * `type` **[ServiceType](#servicetype)**&#x20;
453
+ * `bundeledToo` **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)**&#x20;
454
+
455
+ Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)>**&#x20;
456
+
433
457
  ## domainName
434
458
 
435
459
  Appends default domain if name does not already have a domain.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pmcf",
3
- "version": "6.44.3",
3
+ "version": "6.44.5",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
package/src/services/chrony.mjs CHANGED
@@ -3,8 +3,7 @@ import { FAMILY_IPV4, isLinkLocal } from "ip-utilties";
3
3
  import { FileContentProvider } from "npm-pkgbuild";
4
4
  import {
5
5
  serviceEndpoints,
6
- addType,
7
- ExtraSourceService,
6
+ addType,ExtraSourceService,
8
7
  FAMILY_UNIX,
9
8
  FAMILY_IPV4_IPV6
10
9
  } from "pmcf";
@@ -38,7 +37,17 @@ export class chrony extends ExtraSourceService {
38
37
 
39
38
  async *preparePackages(dir) {
40
39
  const packageData = await this.packageData;
41
- packageData.sources.push(new FileContentProvider(dir + "/"));
40
+
41
+ packageData.sources.push(
42
+ ...(await Array.fromAsync(this.templateContent()))
43
+ );
44
+
45
+ packageData.sources.push(
46
+ new FileContentProvider({
47
+ dir: dir + "/",
48
+ permissions: this.content?.permissions
49
+ })
50
+ );
42
51
 
43
52
  const subnets = [...new Map(this.subnets).values()]; // TODO should be normal
44
53
  const host = this.host;
package/src/services/influxdb.mjs CHANGED
@@ -33,7 +33,14 @@ export class influxdb extends CoreService {
33
33
  async *preparePackages(dir) {
34
34
  const packageData = await this.packageData;
35
35
 
36
- packageData.sources.push(new FileContentProvider(dir + "/"));
36
+ packageData.sources.push(
37
+ ...(await Array.fromAsync(this.templateContent())),
38
+ new FileContentProvider({
39
+ dir,
40
+ pattern: ["**/*"],
41
+ permissions: this.content.permissions
42
+ })
43
+ );
37
44
 
38
45
  await writeLines(
39
46
  join(dir, "etc", "influxdb"),