pmcf 3.21.2 → 4.0.0

package/package.json

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

package/src/module.mjs

@@ -27,7 +27,7 @@ export * from "./services/influxdb.mjs";
 export * from "./services/mosquitto.mjs";
 export * from "./services/headscale.mjs";
 export * from "./services/tailscale.mjs";
-export * from "./services/systemd-journal.mjs";
+export * from "./services/systemd-journald.mjs";
 export * from "./services/systemd-journal-remote.mjs";
 export * from "./services/systemd-journal-upload.mjs";
 export * from "./services/systemd-timesyncd.mjs";

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,6 +62,10 @@ export class MosquittoService extends Service {
     return MosquittoServiceTypeDefinition.name;
   }
 
+  get listener() {
+    return this.endpoint("mqtt").port;
+  }
+
   async *preparePackages(dir) {
     const host = this.host;
     const name = host.name;
@@ -56,24 +82,14 @@ export class MosquittoService extends Service {
       }
     };
 
-    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/systemd-journal-remote.mjs

@@ -105,12 +105,10 @@ export class SystemdJournalRemoteService extends Service {
    * @returns {Object}
    */
   systemdConfigs(name) {
-    return [
-      {
-        serviceName: "systemd-journal-remote.service",
-        configFileName: `etc/systemd/journal-remote.conf.d/${name}.conf`,
-        content: ["Remote", this.getProperties(filterConfigurable)]
-      }
-    ];
+    return {
+      serviceName: `${this.type}.service`,
+      configFileName: `etc/systemd/journal-remote.conf.d/${name}.conf`,
+      content: ["Remote", this.getProperties(filterConfigurable)]
+    };
   }
 }

package/src/services/systemd-journal-upload.mjs

@@ -73,7 +73,7 @@ export class SystemdJournalUploadService extends Service {
    */
   systemdConfigs(name) {
     return {
-      serviceName: "systemd-journal-upload.service",
+      serviceName: `${this.type}.service`,
       configFileName: `etc/systemd/journal-upload.conf.d/${name}.conf`,
       content: ["Upload", this.getProperties(filterConfigurable)]
     };

package/src/services/{systemd-journal.mjs → systemd-journald.mjs}

@@ -7,7 +7,7 @@ import { Service, ServiceTypeDefinition, addServiceType } from "pmcf";
 import { filterConfigurable } from "../utils.mjs";
 
 const SystemdJournalServiceTypeDefinition = {
-  name: "systemd-journal",
+  name: "systemd-journald",
   extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
@@ -109,7 +109,7 @@ const SystemdJournalServiceTypeDefinition = {
   service: {}
 };
 
-export class SystemdJournalService extends Service {
+export class SystemdJournaldService extends Service {
   static {
     addType(this);
     addServiceType(this.typeDefinition.service, this.typeDefinition.name);
@@ -129,7 +129,7 @@ export class SystemdJournalService extends Service {
 
   systemdConfigs(name) {
     return {
-      serviceName: "systemd-journald.service",
+      serviceName: `${this.type}.service`,
       configFileName: `etc/systemd/journal.conf.d/${name}.conf`,
       content: ["Journal", this.getProperties(filterConfigurable)]
     };

package/src/services/systemd-resolved.mjs

@@ -76,7 +76,7 @@ export class SystemdResolvedService extends ExtraSourceService {
     };
 
     return {
-      serviceName: "systemd-resolved.service",
+      serviceName: `${this.type}.service`,
       configFileName: `etc/systemd/resolved.conf.d/${name}.conf`,
       content: [
         "Resolve",

package/src/services/systemd-timesyncd.mjs

@@ -19,13 +19,13 @@ const SystemdTimesyncdServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
 
   attributes: {
-    NTP: {...string_attribute_writable, configurable: true },
-    FallbackNTP: {...string_attribute_writable, configurable: true },
-    RootDistanceMaxSec: {...duration_attribute_writable, configurable: true },
-    PollIntervalMinSec: {...duration_attribute_writable, configurable: true },
-    PollIntervalMaxSec: {...duration_attribute_writable, configurable: true },
-    ConnectionRetrySec: {...duration_attribute_writable, configurable: true },
-    SaveIntervalSec: {...duration_attribute_writable, configurable: true }
+    NTP: { ...string_attribute_writable, configurable: true },
+    FallbackNTP: { ...string_attribute_writable, configurable: true },
+    RootDistanceMaxSec: { ...duration_attribute_writable, configurable: true },
+    PollIntervalMinSec: { ...duration_attribute_writable, configurable: true },
+    PollIntervalMaxSec: { ...duration_attribute_writable, configurable: true },
+    ConnectionRetrySec: { ...duration_attribute_writable, configurable: true },
+    SaveIntervalSec: { ...duration_attribute_writable, configurable: true }
   },
   service: {}
 };
@@ -61,7 +61,7 @@ export class SystemdTimesyncdService extends ExtraSourceService {
     };
 
     return {
-      serviceName: "systemd-timesyncd.service",
+      serviceName: `${this.type}.service`,
       configFileName: `etc/systemd/timesyncd.conf.d/${name}.conf`,
       content: [
         "Time",

package/types/module.d.mts

@@ -27,7 +27,7 @@ export * from "./services/influxdb.mjs";
 export * from "./services/mosquitto.mjs";
 export * from "./services/headscale.mjs";
 export * from "./services/tailscale.mjs";
-export * from "./services/systemd-journal.mjs";
+export * from "./services/systemd-journald.mjs";
 export * from "./services/systemd-journal-remote.mjs";
 export * from "./services/systemd-journal-upload.mjs";
 export * from "./services/systemd-timesyncd.mjs";

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[];

package/types/services/{systemd-journal.d.mts → systemd-journald.d.mts}

@@ -1,4 +1,4 @@
-export class SystemdJournalService extends Service {
+export class SystemdJournaldService extends Service {
     static get typeDefinition(): {
         name: string;
         extends: {