pmcf 3.21.1 → 3.22.0

package/README.md

@@ -58,26 +58,26 @@ generates config packages for:
 *   [HTTPEndpoint](#httpendpoint)
     *   [Parameters](#parameters-6)
     *   [port](#port-1)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-7)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-7)
+        *   [Parameters](#parameters-8)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-8)
+        *   [Parameters](#parameters-9)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-9)
+    *   [Parameters](#parameters-10)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-10)
-*   [cidrAddresses](#cidraddresses)
     *   [Parameters](#parameters-11)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-12)
+*   [cidrAddresses](#cidraddresses)
+    *   [Parameters](#parameters-12)
 *   [isTemplate](#istemplate)
 *   [services](#services)
     *   [Parameters](#parameters-13)
@@ -177,6 +177,18 @@ Endpoint based on http
 
 Returns **[number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)** 
 
+## 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 Service**
@@ -252,18 +264,6 @@ 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;
-
 ## isTemplate
 
 Returns **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)**&#x20;

package/bin/pmcf-package

@@ -42,12 +42,20 @@ const publishingDetails = createPublishingDetails(
 );
 
 for (const object of root.find(args)) {
+  if (object.isTemplate) {
+    continue;
+  }
   const stagingDir = join(options.output, object.fullName);
 
   //console.log(`packages for ${object.fullName}`);
   for await (const { sources, outputs, properties } of object.preparePackages(
     stagingDir
   )) {
+    console.log(
+      (object.fullName + "                ").substring(0, 20),
+      properties.name
+    );
+
     for (const outputFactory of outputs) {
       properties.version = pkg.version;
       properties.license = pkg.license;
@@ -66,9 +74,9 @@ for (const object of root.find(args)) {
         options
       );
 
-      if (properties.verbose) {
-        console.log(artifact);
-      }
+      // if (properties.verbose) {
+      console.log(" -> " + artifact);
+      // }
 
       if (!options.dry) {
         await Promise.all(

package/package.json

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

package/src/cluster.mjs

@@ -80,8 +80,8 @@ export class Cluster extends Host {
       new Set()
     )) {
       const host = ni.host;
-      const name = `keepalived-${host.location.name}-${host.name}`;
-      const packageStagingDir = join(stagingDir, name);
+
+      const packageStagingDir = join(stagingDir, host.name);
       const result = {
         sources: [
           new FileContentProvider(packageStagingDir + "/")[
@@ -90,7 +90,7 @@ export class Cluster extends Host {
         ],
         outputs: host.outputs,
         properties: {
-          name,
+          name: `keepalived-${host.location.name}-${host.name}`,
           description: `${this.typeName} definitions for ${this.fullName}`,
           access: "private",
           dependencies: ["keepalived>=2.3.4"]

package/src/services/chrony.mjs

@@ -63,19 +63,16 @@ export class ChronyService extends ExtraSourceService {
   }
 
   async *preparePackages(dir) {
-    const network = this.network;
     const host = this.host;
     const name = host.name;
 
-    console.log("chrony", host.name, network.name);
-
     const packageData = {
       dir,
       sources: [new FileContentProvider(dir + "/")],
       outputs: this.outputs,
       properties: {
-        name: `chrony-${this.location.name}-${host.name}`,
-        description: `chrony definitions for ${this.fullName}@${name}`,
+        name: `${this.typeName}-${this.location.name}-${host.name}`,
+        description: `${this.typeName} definitions for ${this.fullName}@${name}`,
         access: "private",
         dependencies: ["chrony>=4.6.1"]
       }

package/src/services/influxdb.mjs

@@ -50,7 +50,6 @@ export class InfluxdbService extends Service {
   }
 
   async *preparePackages(dir) {
-    const network = this.network;
     const host = this.host;
     const name = host.name;
 
@@ -59,8 +58,8 @@ export class InfluxdbService extends Service {
       sources: [new FileContentProvider(dir + "/")],
       outputs: this.outputs,
       properties: {
-        name: `influxdb-${this.location.name}-${host.name}`,
-        description: `influxdb definitions for ${this.fullName}@${name}`,
+        name: `${this.typeName}-${this.location.name}-${host.name}`,
+        description: `${this.typeName} definitions for ${this.fullName}@${name}`,
         access: "private",
         dependencies: ["influxdb>=2.7.0"]
       }

package/src/services/kea.mjs

@@ -152,9 +152,6 @@ export class KeaService extends Service {
     const network = this.network;
     const host = this.host;
     const name = host.name;
-    const pkgName = `kea-${this.location.name}-${name}`;
-
-    console.log(pkgName, this.fullName, network.name);
 
     const dnsServerEndpoints = serviceEndpoints(network, {
       services: 'in("dns",types) && priority>=300',
@@ -166,8 +163,8 @@ export class KeaService extends Service {
       sources: [new FileContentProvider(dir + "/")],
       outputs: this.outputs,
       properties: {
-        name: pkgName,
-        description: `kea definitions for ${this.fullName}@${name}`,
+        name: `${this.typeName}-${this.location.name}-${name}`,
+        description: `${this.typeName} definitions for ${this.fullName}@${name}`,
         access: "private",
         dependencies: [`kea>=${keaVersion}`]
       }

package/src/services/mosquitto.mjs

@@ -1,8 +1,13 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
-import { boolean_attribute_writable_true, addType } from "pacc";
+import {
+  boolean_attribute_writable_true,
+  port_attribute,
+  string_attribute_writable,
+  addType
+} from "pacc";
 import { addServiceType } from "pmcf";
-import { writeLines } from "../utils.mjs";
+import { writeLines, filterConfigurable } from "../utils.mjs";
 import { Service, ServiceTypeDefinition } from "../service.mjs";
 
 const MosquittoServiceTypeDefinition = {
@@ -12,13 +17,30 @@ const MosquittoServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   key: "name",
   attributes: {
-    log_timestamp: {
+    /*log_timestamp: {
       ...boolean_attribute_writable_true,
-      isCommonOption: true
+      configurable: true
     },
     allow_anonymous: {
       ...boolean_attribute_writable_true,
-      isCommonOption: true
+      configurable: true
+    },*/
+    listener: {
+      ...port_attribute,
+      writable: true,
+      configurable: true
+    },
+    persistence_location: {
+      ...string_attribute_writable,
+      configurable: true
+    },
+    password_file: {
+      ...string_attribute_writable,
+      configurable: true
+    },
+    acl_file: {
+      ...string_attribute_writable,
+      configurable: true
     }
   },
   service: {
@@ -40,8 +62,11 @@ export class MosquittoService extends Service {
     return MosquittoServiceTypeDefinition.name;
   }
 
+  get listener() {
+    return this.endpoint("mqtt").port;
+  }
+
   async *preparePackages(dir) {
-    const network = this.network;
     const host = this.host;
     const name = host.name;
 
@@ -50,31 +75,21 @@ export class MosquittoService extends Service {
       sources: [new FileContentProvider(dir + "/")],
       outputs: this.outputs,
       properties: {
-        name: `mosquitto-${this.location.name}-${host.name}`,
-        description: `mosquitto definitions for ${this.fullName}@${name}`,
+        name: `${this.typeName}-${this.location.name}-${host.name}`,
+        description: `${this.typeName} definitions for ${this.fullName}@${name}`,
         access: "private",
         dependencies: ["mosquitto>=2.0.22"]
       }
     };
 
-    const lines = Object.entries(MosquittoServiceTypeDefinition.attributes)
-      .filter(
-        ([key, attribute]) =>
-          attribute.isCommonOption && this[key] !== undefined
+    await writeLines(
+      join(dir, "etc", "mosquitto"),
+      "mosquitto.conf",
+      Object.entries(this.getProperties(filterConfigurable)).map(
+        ([name, value]) => `${name} ${value}`
       )
-      .map(([key]) => `${key}: ${this[key]}`);
-
-    const endpoint = this.endpoint("mqtt");
-
-    lines.push(
-      `listener ${endpoint.port}`,
-      "persistence_location /var/lib/mosquitto",
-      "password_file /etc/mosquitto/passwd",
-      "acl_file /etc/mosquitto/acl"
     );
 
-    await writeLines(join(dir, "etc", "mosquitto"), "mosquitto.conf", lines);
-
     yield packageData;
   }
 }

package/src/services/openldap.mjs

@@ -79,21 +79,11 @@ export class OpenLDAPService extends Service {
   }
 
   async *preparePackages(dir) {
-    const network = this.network;
     const host = this.host;
     const name = host.name;
-    const pkgName = `openldap-${this.location.name}-${name}`;
     const owner = "ldap";
     const group = "ldap";
 
-    console.log(
-      pkgName,
-      this.fullName,
-      this.alias,
-      network.name,
-      this.extends.map(o => o.fullName)
-    );
-
     const packageData = {
       dir,
       sources: [
@@ -113,8 +103,8 @@ export class OpenLDAPService extends Service {
       ],
       outputs: this.outputs,
       properties: {
-        name: pkgName,
-        description: `openldap definitions for ${this.fullName}@${name}`,
+        name: `${this.typeName}-${this.location.name}-${name}`,
+        description: `${this.typeName} definitions for ${this.fullName}@${name}`,
         access: "private",
         dependencies: ["openldap>=2.6.10"],
         hooks: {}

package/types/services/mosquitto.d.mts

@@ -743,8 +743,52 @@ export class MosquittoService extends Service {
         })[];
         key: string;
         attributes: {
-            log_timestamp: {
-                isCommonOption: boolean;
+            listener: {
+                writable: boolean;
+                configurable: boolean;
+                type: object;
+                isKey: 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;
+            };
+            persistence_location: {
+                configurable: boolean;
+                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;
+            };
+            password_file: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -765,8 +809,8 @@ export class MosquittoService extends Service {
                 env?: string[] | string;
                 additionalValues?: object;
             };
-            allow_anonymous: {
-                isCommonOption: boolean;
+            acl_file: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -793,6 +837,7 @@ export class MosquittoService extends Service {
         };
     };
     get type(): string;
+    get listener(): any;
     preparePackages(dir: any): AsyncGenerator<{
         dir: any;
         sources: FileContentProvider[];