pmcf 4.5.0 → 4.5.2

package/package.json

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

package/src/services/openldap.mjs

@@ -8,9 +8,8 @@ import {
 } from "pacc";
 import { addServiceType } from "pmcf";
 import { ServiceTypeDefinition, Service } from "../service.mjs";
-import { writeLines, filterConfigurable } from "../utils.mjs";
 import { addHook } from "../hooks.mjs";
-import { createExpressionTransformer } from "content-entry-transform";
+import { createExpressionTransformer, transform } from "content-entry-transform";
 
 const OpenLDAPServiceTypeDefinition = {
   name: "openldap",
@@ -65,7 +64,6 @@ export class OpenLDAPService extends Service {
     return OpenLDAPServiceTypeDefinition;
   }
 
-  DB_CONFIG = {};
   _baseDN;
   _rootDN;
 
@@ -114,19 +112,18 @@ export class OpenLDAPService extends Service {
       group
     };
     const transformers = [
-      createExpressionTransformer(e => true, { base: "ABC123" })
+      createExpressionTransformer(e => true, { base: this.baseDN, uri: this.uri })
     ];
 
     const templateDirs = [];
     for (const e of [...this.allExtends(), this]) {
       const base = join(e.directory, "content") + "/";
-      console.log("TEMPLATE", e.fullName, base);
       templateDirs.push(
-        new FileContentProvider(
+        transform(new FileContentProvider(
           { transformers, base },
           entryProperties,
           directoryProperties
-        )
+        ), transformers)
       );
     }
 
@@ -158,38 +155,6 @@ export class OpenLDAPService extends Service {
       `setfacl -m u:${owner}:r /etc/letsencrypt/archive/*/privkey*.pem`
     );
 
-    await writeLines(
-      join(packageData.dir, "etc/conf.d"),
-      "slapd",
-      this.expand([
-        "SLAPD_OPTIONS=",
-        "SLAPD_URLS=ldap:/// ldaps:/// ldapi://%2Frun%2Fldapi"
-      ])
-    );
-
-    await writeLines(
-      join(packageData.dir, "/var/lib/openldap/openldap-data"),
-      "DB_CONFIG",
-
-      /*
-      ...[...this.propertyIterator(filterConfigurable)].map(
-        ([name, value]) => `${name} ${value}`
-      )
-    */
-
-      this.expand([
-        "set_cachesize 0 16777216 1",
-        "set_lg_regionmax 65536",
-        "set_lg_bsize 524288"
-      ])
-    );
-
-    await writeLines(
-      join(packageData.dir, "etc/openldap"),
-      "ldap.conf",
-      this.expand([`BASE  ${this.baseDN}`, `URI   ${this.uri}`])
-    );
-
     yield packageData;
   }
 }

package/types/services/openldap.d.mts

@@ -864,7 +864,6 @@ export class OpenLDAPService extends Service {
             services: {};
         };
     };
-    DB_CONFIG: {};
     _baseDN: any;
     _rootDN: any;
     get type(): string;
@@ -877,7 +876,7 @@ export class OpenLDAPService extends Service {
     _uri: any;
     preparePackages(dir: any): AsyncGenerator<{
         dir: any;
-        sources: FileContentProvider[];
+        sources: any[];
         outputs: Set<typeof import("npm-pkgbuild").OCI | typeof import("npm-pkgbuild").DOCKER>;
         properties: {
             name: string;
@@ -889,4 +888,3 @@ export class OpenLDAPService extends Service {
     }, void, unknown>;
 }
 import { Service } from "../service.mjs";
-import { FileContentProvider } from "npm-pkgbuild";