pmcf 3.18.7 → 3.18.8

package/package.json

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

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

@@ -1,4 +1,4 @@
-import { addType } from "pacc";
+import { addType, string_attribute_writable } from "pacc";
 import { Service, ServiceTypeDefinition, addServiceType } from "pmcf";
 
 const SystemdJournalRemoteServiceTypeDefinition = {
@@ -7,6 +7,11 @@ const SystemdJournalRemoteServiceTypeDefinition = {
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
   key: "name",
+  attributes: {
+    ServerCertificateFile: string_attribute_writable,
+    ServerKeyFile: string_attribute_writable
+  },
+
   service: {
     services: {
       endpoints: [
@@ -27,6 +32,10 @@ const SystemdJournalRemoteServiceTypeDefinition = {
   }
 };
 
+/**
+ * @property {string} ServerCertificateFile
+ * @property {string} ServerKeyFile
+ */
 export class SystemdJournalRemoteService extends Service {
   static {
     addType(this);
@@ -45,12 +54,23 @@ export class SystemdJournalRemoteService extends Service {
     return this.type;
   }
 
+  /**
+   *
+   * @param {string} name
+   * @returns {Object}
+   */
   systemdConfigs(name) {
     return [
       {
         serviceName: "systemd-journal-remote.service",
         configFileName: `etc/systemd/journal-remote.conf.d/${name}.conf`,
-        content: ["Remote", {}]
+        content: [
+          "Remote",
+          {
+            ServerCertificateFile: this.ServerCertificateFile,
+            ServerKeyFile: this.ServerKeyFile
+          }
+        ]
       } /*,
       {
         serviceName: "systemd-journal-remote.socket"

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

@@ -8,10 +8,17 @@ const SystemdJournalUploadServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   key: "name",
   attributes: {
-    url: string_attribute_writable
+    URL: string_attribute_writable,
+    ServerCertificateFile: string_attribute_writable,
+    ServerKeyFile: string_attribute_writable
   }
 };
 
+/**
+ * @property {string} URL
+ * @property {string} ServerCertificateFile
+ * @property {string} ServerKeyFile
+ */
 export class SystemdJournalUploadService extends Service {
   static {
     addType(this);
@@ -30,13 +37,23 @@ export class SystemdJournalUploadService extends Service {
     return this.type;
   }
 
+  /**
+   * 
+   * @param {string} name 
+   * @returns {Object}
+   */
   systemdConfigs(name) {
     return {
       serviceName: "systemd-journal-upload.service",
       configFileName: `etc/systemd/journal-upload.conf.d/${name}.conf`,
-      content: ["Upload", {
-        URL : this.url
-      }]
+      content: [
+        "Upload",
+        {
+          URL: this.URL,
+          ServerCertificateFile: this.ServerCertificateFile,
+          ServerKeyFile: this.ServerKeyFile
+        }
+      ]
     };
   }
 }

package/types/services/systemd-journal-remote.d.mts

@@ -1,3 +1,7 @@
+/**
+ * @property {string} ServerCertificateFile
+ * @property {string} ServerKeyFile
+ */
 export class SystemdJournalRemoteService extends Service {
     static get typeDefinition(): {
         name: string;
@@ -712,6 +716,10 @@ export class SystemdJournalRemoteService extends Service {
             };
         })[];
         key: string;
+        attributes: {
+            ServerCertificateFile: import("pacc").AttributeDefinition;
+            ServerKeyFile: import("pacc").AttributeDefinition;
+        };
         service: {
             services: {
                 endpoints: {
@@ -725,10 +733,11 @@ export class SystemdJournalRemoteService extends Service {
     };
     get type(): string;
     get systemdServices(): string;
-    systemdConfigs(name: any): {
-        serviceName: string;
-        configFileName: string;
-        content: {}[];
-    }[];
+    /**
+     *
+     * @param {string} name
+     * @returns {Object}
+     */
+    systemdConfigs(name: string): any;
 }
 import { Service } from "pmcf";

package/types/services/systemd-journal-upload.d.mts

@@ -1,3 +1,8 @@
+/**
+ * @property {string} URL
+ * @property {string} ServerCertificateFile
+ * @property {string} ServerKeyFile
+ */
 export class SystemdJournalUploadService extends Service {
     static get typeDefinition(): {
         name: string;
@@ -713,17 +718,18 @@ export class SystemdJournalUploadService extends Service {
         })[];
         key: string;
         attributes: {
-            url: import("pacc").AttributeDefinition;
+            URL: import("pacc").AttributeDefinition;
+            ServerCertificateFile: import("pacc").AttributeDefinition;
+            ServerKeyFile: import("pacc").AttributeDefinition;
         };
     };
     get type(): string;
     get systemdServices(): string;
-    systemdConfigs(name: any): {
-        serviceName: string;
-        configFileName: string;
-        content: (string | {
-            URL: any;
-        })[];
-    };
+    /**
+     *
+     * @param {string} name
+     * @returns {Object}
+     */
+    systemdConfigs(name: string): any;
 }
 import { Service } from "pmcf";