pmcf 6.3.9 → 6.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.3.9",
+  "version": "6.4.0",
   "publishConfig": {
     "access": "public"
   },
@@ -52,17 +52,18 @@
   "dependencies": {
     "aggregated-map": "^1.0.7",
     "content-entry-transform": "^1.6.9",
-    "ip-utilties": "^3.4.0",
+    "ip-utilties": "^3.5.3",
     "npm-pkgbuild": "^20.8.1",
     "pacc": "^10.4.1",
-    "package-directory": "^8.2.0"
+    "package-directory": "^8.2.0",
+    "yaml": "^2.9.0"
   },
   "devDependencies": {
     "@types/node": "^26.1.1",
     "ava": "^8.0.1",
     "c8": "^11.0.0",
     "documentation": "^14.0.3",
-    "semantic-release": "^25.0.5"
+    "semantic-release": "^25.0.6"
   },
   "overrides": {
     "c8": {

package/src/base.mjs

@@ -260,7 +260,7 @@ export class Base {
    * @return {Iterable<[string,any]>} values
    */
   *attributeIterator(filter) {
-    for (const [path, def] of extendingAttributeIterator(
+    for (const [path, attribute] of extendingAttributeIterator(
       this.constructor,
       filter
     )) {
@@ -268,7 +268,7 @@ export class Base {
       const value = this.attribute(name);
 
       if (value !== undefined) {
-        yield [def.externalName ?? name, toExternal(value, def), path, def];
+        yield [attribute.externalName ?? name, toExternal(value, attribute), path, attribute];
       }
     }
   }

package/src/services/chrony.mjs

@@ -1,7 +1,6 @@
 import { join } from "node:path";
-import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
+import { FAMILY_IPV4, FAMILY_IPV6, isLinkLocal } from "ip-utilties";
 import { FileContentProvider } from "npm-pkgbuild";
-import { isLinkLocal } from "ip-utilties";
 import { serviceEndpoints, addType, ExtraSourceService, FAMILY_UNIX } from "pmcf";
 import { writeLines } from "../utils.mjs";
 

package/src/services/influxdb.mjs

@@ -1,13 +1,10 @@
 import { join } from "node:path";
+import { stringify } from "yaml";
 import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
 import { FileContentProvider } from "npm-pkgbuild";
 import { boolean_attribute_writable_true } from "pacc";
 import { CoreService, addType } from "pmcf";
-import {
-  writeLines,
-  setionLinesFromPropertyIterator,
-  filterConfigurable
-} from "../utils.mjs";
+import { writeLines, filterConfigurable } from "../utils.mjs";
 
 export class influxdb extends CoreService {
   static attributes = {
@@ -49,8 +46,12 @@ export class influxdb extends CoreService {
     await writeLines(
       join(dir, "etc", "influxdb"),
       "config.yml",
-      setionLinesFromPropertyIterator(
-        this.attributeIterator(filterConfigurable)
+      stringify(
+        Object.fromEntries(
+          [...this.attributeIterator(filterConfigurable)].map(
+            ([name, value, path, attribute]) => [attribute.externalName, value]
+          )
+        )
       )
     );
 

package/src/services/mosquitto.mjs

@@ -1,5 +1,12 @@
+import { join } from "node:path";
+import { FileContentProvider } from "npm-pkgbuild";
 import { port_attribute, string_attribute_writable } from "pacc";
 import { CoreService, addType } from "pmcf";
+import {
+  writeLines,
+  setionLinesFromAttributeIterator,
+  filterConfigurable
+} from "../utils.mjs";
 
 export class mosquitto extends CoreService {
   static attributes = {
@@ -57,6 +64,16 @@ export class mosquitto extends CoreService {
       )
     );
 
+    packageData.sources.push(new FileContentProvider(dir + "/"));
+
+    await writeLines(
+      join(dir, "etc", "mosquitto"),
+      "moquitto.conf",
+      setionLinesFromAttributeIterator(
+        this.attributeIterator(filterConfigurable), " "
+      )
+    );
+
     yield packageData;
   }
 }

package/src/services/systemd-resolved.mjs

@@ -11,7 +11,7 @@ import {
   filterConfigurable,
   yesno,
   sectionLines,
-  setionLinesFromPropertyIterator
+  setionLinesFromAttributeIterator
 } from "../utils.mjs";
 
 export class SystemdResolvedService extends ExtraSourceService {
@@ -110,7 +110,7 @@ export class SystemdResolvedService extends ExtraSourceService {
     return {
       serviceName: this.systemdService,
       configFileName: `etc/systemd/resolved.conf.d/${name}.conf`,
-      //content: [...setionLinesFromPropertyIterator(this.attributeIterator( filterConfigurable)), "A=1"]
+      //content: [...setionLinesFromAttributeIterator(this.attributeIterator( filterConfigurable)), "A=1"]
       content: sectionLines("Resolve", {
         DNS: serviceEndpoints(this, options(300, 399, 4)),
         FallbackDNS: serviceEndpoints(this, options(100, 199, 4)),

package/src/utils.mjs

@@ -77,12 +77,12 @@ export function sectionLines(sectionName, values) {
   return lines;
 }
 
-export function* setionLinesFromPropertyIterator(properties) {
+export function* setionLinesFromAttributeIterator(properties, separator="=") {
   for (const [name, value, path, attribute] of properties) {
     if (attribute.attributes) {
       yield `[${name}]`;
     } else {
-      yield `${name}=${value}`;
+      yield `${name}${separator}${value}`;
     }
   }
 }