pmcf 6.3.10 → 6.4.1

package/README.md

@@ -77,26 +77,26 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-13)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-14)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-15)
+        *   [Parameters](#parameters-14)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-16)
+        *   [Parameters](#parameters-15)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-17)
+    *   [Parameters](#parameters-16)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-18)
+    *   [Parameters](#parameters-17)
 *   [cidrAddresses](#cidraddresses)
-    *   [Parameters](#parameters-19)
+    *   [Parameters](#parameters-18)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-19)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
@@ -286,18 +286,6 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 *   `directory`   (optional, default `"/"`)
 
-## SkeletonNetworkInterface
-
-**Extends ServiceOwner**
-
-### networkAddresses
-
-#### Parameters
-
-*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
-
-Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
-
 ## SystemdJournalRemoteService
 
 **Extends CoreService**
@@ -373,6 +361,18 @@ Returns **Iterable<[string](https://developer.mozilla.org/docs/Web/JavaScript/Re
 
 Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
 
+## SkeletonNetworkInterface
+
+**Extends ServiceOwner**
+
+### networkAddresses
+
+#### Parameters
+
+*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
+
+Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
+
 ## families
 
 Returns **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.3.10",
+  "version": "6.4.1",
   "publishConfig": {
     "access": "public"
   },
@@ -52,7 +52,7 @@
   "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",
@@ -63,7 +63,7 @@
     "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/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

@@ -4,11 +4,7 @@ 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 = {

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"),
+      "mosquitto.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}`;
     }
   }
 }