pmcf 6.60.1 → 6.60.3

package/package.json

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

package/src/core-service.mjs

@@ -109,7 +109,7 @@ export class CoreService extends base {
   }
 
   get credentials() {
-    return this.mapFromDirections(["this", "extends"], "_credentials")
+    return this.mapFromDirections(["this", "extends"], "_credentials");
   }
 
   get network() {
@@ -289,7 +289,6 @@ export class CoreService extends base {
     const seen = new Set();
 
     for (const [name, cred] of this.credentials) {
-      //console.log(this.fullName,name);
       if (cred.systemdCredential && !seen.has(name)) {
         seen.add(name);
         lines.push(
@@ -300,8 +299,9 @@ export class CoreService extends base {
 
     if (lines.length) {
       await writeLines(
-        join(dir, `etc/systemd/system/${name}.service.d`),
+        join(dir, `etc/systemd/system/${name}.d`),
         `credentials.conf`,
+        "[Service]",
         lines
       );
     }

package/src/services/kea.mjs

@@ -470,8 +470,8 @@ export class kea extends CoreService {
 
     const packageData = await this.preparePackage(dir);
 
-    await this.writeSystemdCredentialConfig(dir, "kea-dhcp4");
-    await this.writeSystemdCredentialConfig(dir, "kea-dhcp6");
+    await this.writeSystemdCredentialConfig(dir, "kea-dhcp4.service");
+    await this.writeSystemdCredentialConfig(dir, "kea-dhcp6.service");
 
     for (const [name, data] of Object.entries({
       "kea-dhcp-ddns": ddns,

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);