pmcf 6.60.0 → 6.60.2

package/README.md

@@ -81,30 +81,30 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-14)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-15)
 *   [Interface](#interface)
 *   [zones](#zones)
 *   [addressesStatement](#addressesstatement)
-    *   [Parameters](#parameters-16)
+    *   [Parameters](#parameters-15)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-17)
+        *   [Parameters](#parameters-16)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-18)
+        *   [Parameters](#parameters-17)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-19)
+    *   [Parameters](#parameters-18)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-20)
+    *   [Parameters](#parameters-19)
 *   [cidrAddresses](#cidraddresses)
-    *   [Parameters](#parameters-21)
+    *   [Parameters](#parameters-20)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-21)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
@@ -308,18 +308,6 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 *   `directory`   (optional, default `"/"`)
 
-## SkeletonNetworkInterface
-
-**Extends Interface**
-
-### networkAddresses
-
-#### Parameters
-
-*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
-
-Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
-
 ## Interface
 
 **Extends ServiceOwner**
@@ -413,6 +401,18 @@ Returns **Iterable<[string](https://developer.mozilla.org/docs/Web/JavaScript/Re
 
 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;
 
+## SkeletonNetworkInterface
+
+**Extends Interface**
+
+### networkAddresses
+
+#### Parameters
+
+*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
+
+Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
+
 ## families
 
 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

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.60.0",
+  "version": "6.60.2",
   "publishConfig": {
     "access": "public"
   },

package/src/core-service.mjs

@@ -22,6 +22,7 @@ import {
   HTTPEndpoint,
   unix_endpoint
 } from "pmcf";
+import { writeLines } from "./utils.mjs";
 import { addType } from "./type.mjs";
 import { FAMILY_UNIX, FAMILY_DNS } from "./constants.mjs";
 import {
@@ -101,12 +102,16 @@ export class CoreService extends base {
   _weight;
   _port;
   _systemdService;
-  credentials = new Map();
+  _credentials = new Map();
 
   toString() {
     return `${this.fullName}(${this.type})`;
   }
 
+  get credentials() {
+    return this.mapFromDirections(["this", "extends"], "_credentials");
+  }
+
   get network() {
     return this.owner.network;
   }
@@ -280,8 +285,13 @@ export class CoreService extends base {
 
   async writeSystemdCredentialConfig(dir, name) {
     let lines = [];
+
+    const seen = new Set();
+
     for (const [name, cred] of this.credentials) {
-      if (cred.systemdCredential) {
+      //console.log(this.fullName,name);
+      if (cred.systemdCredential && !seen.has(name)) {
+        seen.add(name);
         lines.push(
           `LoadCredentialEncrypted=${name}:/etc/credstore.encrypted/${name}`
         );
@@ -292,6 +302,7 @@ export class CoreService extends base {
       await writeLines(
         join(dir, `etc/systemd/system/${name}.service.d`),
         `credentials.conf`,
+        "[Service]",
         lines
       );
     }

package/src/utils.mjs

@@ -35,24 +35,13 @@ export function domainFromDominName(domainName, defaultDomain) {
   return defaultDomain;
 }
 
-export async function writeLines(dir, name, lines) {
-  let data;
-
-  switch (typeof lines) {
-    case "undefined":
-      return;
-    case "string":
-      data = lines;
-      break;
-
-    default:
-      data = [...lines]
+export async function writeLines(dir, name, ...lines) {
+  const data = lines
         .flat()
         .filter(line => line !== undefined)
         .map(l => l + "\n")
         .join("");
-  }
-
+  
   const full = join(dir, name);
   dir = dirname(full);
   name = basename(full);