pmcf 6.60.2 → 6.60.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.
Files changed (4) hide show
  1. package/README.md +21 -21
  2. package/package.json +3 -2
  3. package/src/core-service.mjs +1 -2
  4. package/src/services/kea.mjs +2 -2
package/README.md CHANGED
@@ -81,30 +81,30 @@ generates config packages for:
81
81
  * [domainNames](#domainnames)
82
82
  * [InitializationContext](#initializationcontext)
83
83
  * [Parameters](#parameters-14)
84
+ * [SkeletonNetworkInterface](#skeletonnetworkinterface)
85
+ * [networkAddresses](#networkaddresses)
86
+ * [Parameters](#parameters-15)
84
87
  * [Interface](#interface)
85
88
  * [zones](#zones)
86
89
  * [addressesStatement](#addressesstatement)
87
- * [Parameters](#parameters-15)
90
+ * [Parameters](#parameters-16)
88
91
  * [SystemdJournalRemoteService](#systemdjournalremoteservice)
89
92
  * [Properties](#properties)
90
93
  * [systemdConfigs](#systemdconfigs)
91
- * [Parameters](#parameters-16)
94
+ * [Parameters](#parameters-17)
92
95
  * [SystemdJournalUploadService](#systemdjournaluploadservice)
93
96
  * [Properties](#properties-1)
94
97
  * [systemdConfigs](#systemdconfigs-1)
95
- * [Parameters](#parameters-17)
98
+ * [Parameters](#parameters-18)
96
99
  * [NetworkAddress](#networkaddress)
97
- * [Parameters](#parameters-18)
100
+ * [Parameters](#parameters-19)
98
101
  * [subnet](#subnet)
99
102
  * [networkInterface](#networkinterface)
100
103
  * [address](#address)
101
104
  * [addresses](#addresses)
102
- * [Parameters](#parameters-19)
103
- * [cidrAddresses](#cidraddresses)
104
105
  * [Parameters](#parameters-20)
105
- * [SkeletonNetworkInterface](#skeletonnetworkinterface)
106
- * [networkAddresses](#networkaddresses)
107
- * [Parameters](#parameters-21)
106
+ * [cidrAddresses](#cidraddresses)
107
+ * [Parameters](#parameters-21)
108
108
  * [families](#families)
109
109
  * [secretName](#secretname)
110
110
  * [directHosts](#directhosts)
@@ -308,6 +308,18 @@ Keeps track of all in flight object creations and loose ends during config initi
308
308
 
309
309
  * `directory` (optional, default `"/"`)
310
310
 
311
+ ## SkeletonNetworkInterface
312
+
313
+ **Extends Interface**
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
+
311
323
  ## Interface
312
324
 
313
325
  **Extends ServiceOwner**
@@ -401,18 +413,6 @@ Returns **Iterable<[string](https://developer.mozilla.org/docs/Web/JavaScript/Re
401
413
 
402
414
  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;
403
415
 
404
- ## SkeletonNetworkInterface
405
-
406
- **Extends Interface**
407
-
408
- ### networkAddresses
409
-
410
- #### Parameters
411
-
412
- * `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** (optional, default `n=>true`)
413
-
414
- Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
415
-
416
416
  ## families
417
417
 
418
418
  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;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pmcf",
3
- "version": "6.60.2",
3
+ "version": "6.60.4",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -52,9 +52,10 @@
52
52
  "dependencies": {
53
53
  "aggregated-map": "^1.0.11",
54
54
  "content-entry-transform": "^1.7.8",
55
+ "filtered-map": "^1.0.0",
55
56
  "ip-utilties": "^3.13.1",
56
57
  "npm-pkgbuild": "^22.2.6",
57
- "pacc": "^11.16.0",
58
+ "pacc": "^11.17.0",
58
59
  "package-directory": "^8.2.0",
59
60
  "yaml": "^2.9.1"
60
61
  },
package/src/core-service.mjs CHANGED
@@ -289,7 +289,6 @@ export class CoreService extends base {
289
289
  const seen = new Set();
290
290
 
291
291
  for (const [name, cred] of this.credentials) {
292
- //console.log(this.fullName,name);
293
292
  if (cred.systemdCredential && !seen.has(name)) {
294
293
  seen.add(name);
295
294
  lines.push(
@@ -300,7 +299,7 @@ export class CoreService extends base {
300
299
 
301
300
  if (lines.length) {
302
301
  await writeLines(
303
- join(dir, `etc/systemd/system/${name}.service.d`),
302
+ join(dir, `etc/systemd/system/${name}.d`),
304
303
  `credentials.conf`,
305
304
  "[Service]",
306
305
  lines
package/src/services/kea.mjs CHANGED
@@ -470,8 +470,8 @@ export class kea extends CoreService {
470
470
 
471
471
  const packageData = await this.preparePackage(dir);
472
472
 
473
- await this.writeSystemdCredentialConfig(dir, "kea-dhcp4");
474
- await this.writeSystemdCredentialConfig(dir, "kea-dhcp6");
473
+ await this.writeSystemdCredentialConfig(dir, "kea-dhcp4.service");
474
+ await this.writeSystemdCredentialConfig(dir, "kea-dhcp6.service");
475
475
 
476
476
  for (const [name, data] of Object.entries({
477
477
  "kea-dhcp-ddns": ddns,