pmcf 4.1.3 → 4.1.4

package/package.json

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

package/src/services/influxdb.mjs

@@ -2,7 +2,11 @@ import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import { boolean_attribute_writable_true, addType } from "pacc";
 import { addServiceType } from "pmcf";
-import { writeLines } from "../utils.mjs";
+import {
+  writeLines,
+  setionLinesFromPropertyIterator,
+  filterConfigurable
+} from "../utils.mjs";
 import { Service, ServiceTypeDefinition } from "../service.mjs";
 
 const InfluxdbServiceTypeDefinition = {
@@ -12,7 +16,8 @@ const InfluxdbServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   key: "name",
   attributes: {
-    "metrics-disabled": {
+    "metricsDisabled": {
+      externalName: "metrics-disabled",
       ...boolean_attribute_writable_true,
       configurable: true
     }
@@ -65,14 +70,11 @@ export class InfluxdbService extends Service {
       }
     };
 
-    const lines = Object.entries(InfluxdbServiceTypeDefinition.attributes)
-      .filter(
-        ([key, attribute]) =>
-          attribute.configurable && this[key] !== undefined
-      )
-      .map(([key]) => `${key}: ${this[key]}`);
-
-    await writeLines(join(dir, "etc", "influxdb"), "config.yml", lines);
+    await writeLines(
+      join(dir, "etc", "influxdb"),
+      "config.yml",
+      setionLinesFromPropertyIterator(this.propertyIterator(filterConfigurable))
+    );
 
     yield packageData;
   }

package/src/services/mosquitto.mjs

@@ -7,7 +7,7 @@ import {
   addType
 } from "pacc";
 import { addServiceType } from "pmcf";
-import { writeLines, filterConfigurable } from "../utils.mjs";
+import { writeLines, filterConfigurable, setionLinesFromPropertyIterator } from "../utils.mjs";
 import { Service, ServiceTypeDefinition } from "../service.mjs";
 
 const MosquittoServiceTypeDefinition = {
@@ -85,11 +85,9 @@ export class MosquittoService extends Service {
     await writeLines(
       join(dir, "etc", "mosquitto"),
       "mosquitto.conf",
-      Object.entries(this.getProperties(filterConfigurable)).map(
-        ([name, value]) => `${name} ${value}`
-      )
+          setionLinesFromPropertyIterator(this.propertyIterator(filterConfigurable))
     );
-
+    
     yield packageData;
   }
 }

package/src/services/openldap.mjs

@@ -1,9 +1,14 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
-import { string_attribute_writable, addType } from "pacc";
+import {
+  string_attribute_writable,
+  number_attribute_writable,
+  object_attribute,
+  addType
+} from "pacc";
 import { addServiceType } from "pmcf";
 import { ServiceTypeDefinition, Service } from "../service.mjs";
-import { writeLines } from "../utils.mjs";
+import { writeLines, filterConfigurable } from "../utils.mjs";
 import { addHook } from "../hooks.mjs";
 
 const OpenLDAPServiceTypeDefinition = {
@@ -15,7 +20,28 @@ const OpenLDAPServiceTypeDefinition = {
   attributes: {
     baseDN: string_attribute_writable,
     rootDN: string_attribute_writable,
-    uri: string_attribute_writable
+    uri: string_attribute_writable,
+
+    DB_CONFIG: {
+      ...object_attribute,
+      attributes: {
+        set_cachesize: {
+          ...string_attribute_writable,
+          configurable: true,
+          default: "0 16777216 1"
+        },
+        set_lg_regionmax: {
+          ...number_attribute_writable,
+          configurable: true,
+          default: 65536
+        },
+        set_lg_bsize: {
+          ...number_attribute_writable,
+          configurable: true,
+          default: 524288
+        }
+      }
+    }
   },
   service: {
     systemdService: "slapd.service",
@@ -43,6 +69,7 @@ export class OpenLDAPService extends Service {
     return OpenLDAPServiceTypeDefinition;
   }
 
+  DB_CONFIG = {};
   _baseDN;
   _rootDN;
 
@@ -131,6 +158,13 @@ export class OpenLDAPService extends Service {
     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",

package/types/services/influxdb.d.mts

@@ -743,7 +743,7 @@ export class InfluxdbService extends Service {
         })[];
         key: string;
         attributes: {
-            "metrics-disabled": {
+            metricsDisabled: {
                 configurable: boolean;
                 type: object;
                 isKey: boolean;
@@ -761,7 +761,7 @@ export class InfluxdbService extends Service {
                 toInternal?: Function;
                 toExternal?: Function;
                 values?: Set<any>;
-                externalName?: string;
+                externalName: string;
                 env?: string[] | string;
                 additionalValues?: object;
             };

package/types/services/openldap.d.mts

@@ -746,6 +746,95 @@ export class OpenLDAPService extends Service {
             baseDN: import("pacc").AttributeDefinition;
             rootDN: import("pacc").AttributeDefinition;
             uri: import("pacc").AttributeDefinition;
+            DB_CONFIG: {
+                attributes: {
+                    set_cachesize: {
+                        configurable: boolean;
+                        default: string;
+                        type: object;
+                        isKey: boolean;
+                        writable: boolean;
+                        mandatory: boolean;
+                        collection: boolean;
+                        private?: boolean;
+                        credential?: boolean;
+                        persistent?: boolean;
+                        depends?: string;
+                        description?: string;
+                        set?: Function;
+                        get?: Function;
+                        toInternal?: Function;
+                        toExternal?: Function;
+                        values?: Set<any>;
+                        externalName?: string;
+                        env?: string[] | string;
+                        additionalValues?: object;
+                    };
+                    set_lg_regionmax: {
+                        configurable: boolean;
+                        default: number;
+                        type: object;
+                        isKey: boolean;
+                        writable: boolean;
+                        mandatory: boolean;
+                        collection: boolean;
+                        private?: boolean;
+                        credential?: boolean;
+                        persistent?: boolean;
+                        depends?: string;
+                        description?: string;
+                        set?: Function;
+                        get?: Function;
+                        toInternal?: Function;
+                        toExternal?: Function;
+                        values?: Set<any>;
+                        externalName?: string;
+                        env?: string[] | string;
+                        additionalValues?: object;
+                    };
+                    set_lg_bsize: {
+                        configurable: boolean;
+                        default: number;
+                        type: object;
+                        isKey: boolean;
+                        writable: boolean;
+                        mandatory: boolean;
+                        collection: boolean;
+                        private?: boolean;
+                        credential?: boolean;
+                        persistent?: boolean;
+                        depends?: string;
+                        description?: string;
+                        set?: Function;
+                        get?: Function;
+                        toInternal?: Function;
+                        toExternal?: Function;
+                        values?: Set<any>;
+                        externalName?: string;
+                        env?: string[] | string;
+                        additionalValues?: object;
+                    };
+                };
+                type: object;
+                isKey: boolean;
+                writable: boolean;
+                mandatory: boolean;
+                collection: boolean;
+                private?: boolean;
+                credential?: boolean;
+                persistent?: boolean;
+                depends?: string;
+                description?: string;
+                default?: any;
+                set?: Function;
+                get?: Function;
+                toInternal?: Function;
+                toExternal?: Function;
+                values?: Set<any>;
+                externalName?: string;
+                env?: string[] | string;
+                additionalValues?: object;
+            };
         };
         service: {
             systemdService: string;
@@ -760,6 +849,7 @@ export class OpenLDAPService extends Service {
             };
         };
     };
+    DB_CONFIG: {};
     _baseDN: any;
     _rootDN: any;
     get type(): string;