pmcf 6.4.0 → 6.5.0

package/package.json

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

package/src/base.mjs

@@ -268,7 +268,12 @@ export class Base {
       const value = this.attribute(name);
 
       if (value !== undefined) {
-        yield [attribute.externalName ?? name, toExternal(value, attribute), path, attribute];
+        yield [
+          attribute.externalName ?? name,
+          toExternal(value, attribute),
+          path,
+          attribute
+        ];
       }
     }
   }
@@ -414,6 +419,25 @@ export class Base {
     return new Set(allOutputs.filter(o => this.packaging.has(o.name)));
   }
 
+  get packageContentPermissions() {
+    const owner = this.constructor.name;
+    const group = owner;
+    const premissions = [
+      {
+        mode: 0o644,
+        owner,
+        group
+      },
+      {
+        mode: 0o755,
+        owner,
+        group
+      }
+    ];
+
+    return premissions;
+  }
+
   get packageData() {
     const nameParts = [this.typeName, this.owner?.name, this.name];
     return {

package/src/services/mosquitto.mjs

@@ -45,32 +45,27 @@ export class mosquitto extends CoreService {
   }
 
   async *preparePackages(dir) {
-    const owner = "mosquitto";
-    const group = "mosquitto";
-
+    console.log(
+      "MOSQUITTO",
+      [...this.walkDirections(["extends"])].map(n => this.fullName)
+    );
+    const permissions = this.packageContentPermissions;
     const packageData = this.packageData;
+
     packageData.sources = await Array.fromAsync(
-      this.templateContent(
-        {
-          mode: 0o644,
-          owner,
-          group
-        },
-        {
-          mode: 0o755,
-          owner,
-          group
-        }
-      )
+      this.templateContent(...permissions)
     );
 
-    packageData.sources.push(new FileContentProvider(dir + "/"));
+    packageData.sources.push(
+      new FileContentProvider(dir + "/", ...permissions)
+    );
 
     await writeLines(
       join(dir, "etc", "mosquitto"),
-      "moquitto.conf",
+      "mosquitto.conf",
       setionLinesFromAttributeIterator(
-        this.attributeIterator(filterConfigurable), " "
+        this.attributeIterator(filterConfigurable),
+        " "
       )
     );
 

package/src/services/openldap.mjs

@@ -34,24 +34,11 @@ export class openldap extends CoreService {
   }
 
   async *preparePackages(dir) {
-    const owner = "ldap";
-    const group = "ldap";
-
+    const permissions = this.packageContentPermissions;
     const packageData = this.packageData;
 
     packageData.sources = await Array.fromAsync(
-      this.templateContent(
-        {
-          mode: 0o644,
-          owner,
-          group
-        },
-        {
-          mode: 0o755,
-          owner,
-          group
-        }
-      )
+      this.templateContent(...permissions)
     );
 
     yield packageData;