pmcf 2.70.11 → 2.71.0

package/package.json

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

package/src/cluster.mjs

@@ -125,7 +125,13 @@ export class Cluster extends Host {
         }
 
         cfg.push(`  virtual_router_id ${cluster.routerId}`);
-        cfg.push(`  priority ${host.priority - cluster.masters.indexOf(ni)}`);
+
+        let reducedPrio = cluster.masters.indexOf(ni);
+        if(reducedPrio < 0) {
+          reducedPrio = cluster.backups.indexOf(ni) + 5;
+        }
+
+        cfg.push(`  priority ${host.priority - reducedPrio}`);
         cfg.push("  smtp_alert");
         cfg.push("  advert_int 5");
         cfg.push("  authentication {");

package/src/services/openldap.mjs

@@ -1,10 +1,7 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import { addType } from "../types.mjs";
-import {
-  ServiceTypeDefinition,
-  Service
-} from "../service.mjs";
+import { ServiceTypeDefinition, Service } from "../service.mjs";
 import { writeLines } from "../utils.mjs";
 
 const OpenLDAPServiceTypeDefinition = {
@@ -13,7 +10,23 @@ const OpenLDAPServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
   priority: 0.1,
-  properties: {},
+  properties: {
+    baseDN: {
+      type: "string",
+      collection: false,
+      writeable: true
+    },
+    rootDN: {
+      type: "string",
+      collection: false,
+      writeable: true
+    },
+    uri: {
+      type: "string",
+      collection: false,
+      writeable: true
+    }
+  },
   service: {}
 };
 
@@ -26,6 +39,9 @@ export class OpenLDAPService extends Service {
     return OpenLDAPServiceTypeDefinition;
   }
 
+  baseDN;
+  rootDN;
+
   constructor(owner, data) {
     super(owner, data);
     this.read(data, OpenLDAPServiceTypeDefinition);
@@ -35,6 +51,17 @@ export class OpenLDAPService extends Service {
     return OpenLDAPServiceTypeDefinition.name;
   }
 
+  get uri()
+  {
+    return this._uri;
+  }
+
+  set uri(value)
+  {
+    console.log("SET URI",value);
+    this._uri = value;
+  }
+
   async *preparePackages(dir) {
     const network = this.network;
     const host = this.host;
@@ -59,6 +86,12 @@ export class OpenLDAPService extends Service {
       "SLAPD_URLS=ldap:/// ldaps:///"
     ]);
 
+    console.log(this);
+    await writeLines(join(packageData.dir, "etc/openldap"), "ldap.conf", [
+      `BASE=${this.baseDN}`,
+      `URI=${this.uri}`
+    ]);
+
     yield packageData;
   }
 }

package/types/services/openldap.d.mts

@@ -251,10 +251,31 @@ export class OpenLDAPService extends Service {
             };
         };
         priority: number;
-        properties: {};
+        properties: {
+            baseDN: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
+            rootDN: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
+            uri: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
+        };
         service: {};
     };
+    baseDN: any;
+    rootDN: any;
     get type(): string;
+    set uri(value: any);
+    get uri(): any;
+    _uri: any;
     preparePackages(dir: any): AsyncGenerator<{
         dir: any;
         sources: FileContentProvider[];