pmcf 3.18.8 → 3.18.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/package.json +2 -2
  2. package/src/services/systemd-journal-remote.mjs +5 -5
  3. package/src/services/systemd-journal-upload.mjs +32 -10
  4. package/types/services/systemd-journal-upload.d.mts +100 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pmcf",
3
- "version": "3.18.8",
3
+ "version": "3.18.10",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -53,7 +53,7 @@
53
53
  "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
54
54
  },
55
55
  "dependencies": {
56
- "ip-utilties": "^2.0.1",
56
+ "ip-utilties": "^2.0.2",
57
57
  "npm-pkgbuild": "^19.1.2",
58
58
  "pacc": "^6.6.3",
59
59
  "package-directory": "^8.1.0"
package/src/services/systemd-journal-remote.mjs CHANGED
@@ -1,4 +1,4 @@
1
- import { addType, string_attribute_writable } from "pacc";
1
+ import { getAttributesJSON, addType, string_attribute_writable } from "pacc";
2
2
  import { Service, ServiceTypeDefinition, addServiceType } from "pmcf";
3
3
 
4
4
  const SystemdJournalRemoteServiceTypeDefinition = {
@@ -66,10 +66,10 @@ export class SystemdJournalRemoteService extends Service {
66
66
  configFileName: `etc/systemd/journal-remote.conf.d/${name}.conf`,
67
67
  content: [
68
68
  "Remote",
69
- {
70
- ServerCertificateFile: this.ServerCertificateFile,
71
- ServerKeyFile: this.ServerKeyFile
72
- }
69
+ getAttributesJSON(
70
+ this,
71
+ SystemdJournalRemoteServiceTypeDefinition.attributes
72
+ )
73
73
  ]
74
74
  } /*,
75
75
  {
package/src/services/systemd-journal-upload.mjs CHANGED
@@ -1,4 +1,9 @@
1
- import { string_attribute_writable, addType } from "pacc";
1
+ import {
2
+ string_attribute_writable,
3
+ boolean_attribute_writable,
4
+ addType,
5
+ getAttributesJSON
6
+ } from "pacc";
2
7
  import { Service, ServiceTypeDefinition, addServiceType } from "pmcf";
3
8
 
4
9
  const SystemdJournalUploadServiceTypeDefinition = {
@@ -9,8 +14,26 @@ const SystemdJournalUploadServiceTypeDefinition = {
9
14
  key: "name",
10
15
  attributes: {
11
16
  URL: string_attribute_writable,
12
- ServerCertificateFile: string_attribute_writable,
13
- ServerKeyFile: string_attribute_writable
17
+ ServerKeyFile: {
18
+ ...string_attribute_writable
19
+ // default: "/etc/ssl/private/journal-upload.pem"
20
+ },
21
+ ServerCertificateFile: {
22
+ ...string_attribute_writable
23
+ // default: "/etc/ssl/certs/journal-upload.pem"
24
+ },
25
+ TrustedCertificateFile: {
26
+ ...string_attribute_writable
27
+ // default: "/etc/ssl/ca/trusted.pem"
28
+ },
29
+ Compression: {
30
+ ...string_attribute_writable
31
+ // default: "zstd lz4 xz"
32
+ },
33
+ ForceCompression: {
34
+ ...boolean_attribute_writable
35
+ // default: false
36
+ }
14
37
  }
15
38
  };
16
39
 
@@ -38,8 +61,8 @@ export class SystemdJournalUploadService extends Service {
38
61
  }
39
62
 
40
63
  /**
41
- *
42
- * @param {string} name
64
+ *
65
+ * @param {string} name
43
66
  * @returns {Object}
44
67
  */
45
68
  systemdConfigs(name) {
@@ -48,11 +71,10 @@ export class SystemdJournalUploadService extends Service {
48
71
  configFileName: `etc/systemd/journal-upload.conf.d/${name}.conf`,
49
72
  content: [
50
73
  "Upload",
51
- {
52
- URL: this.URL,
53
- ServerCertificateFile: this.ServerCertificateFile,
54
- ServerKeyFile: this.ServerKeyFile
55
- }
74
+ getAttributesJSON(
75
+ this,
76
+ SystemdJournalUploadServiceTypeDefinition.attributes
77
+ )
56
78
  ]
57
79
  };
58
80
  }
package/types/services/systemd-journal-upload.d.mts CHANGED
@@ -719,8 +719,106 @@ export class SystemdJournalUploadService extends Service {
719
719
  key: string;
720
720
  attributes: {
721
721
  URL: import("pacc").AttributeDefinition;
722
- ServerCertificateFile: import("pacc").AttributeDefinition;
723
- ServerKeyFile: import("pacc").AttributeDefinition;
722
+ ServerKeyFile: {
723
+ type: object;
724
+ isKey: boolean;
725
+ writable: boolean;
726
+ mandatory: boolean;
727
+ collection: boolean;
728
+ private?: boolean;
729
+ credential?: boolean;
730
+ persistent?: boolean;
731
+ depends?: string;
732
+ description?: string;
733
+ default?: any;
734
+ set?: Function;
735
+ get?: Function;
736
+ prepareValue?: Function;
737
+ values?: Set<any>;
738
+ externalName?: string;
739
+ env?: string[] | string;
740
+ additionalValues?: object;
741
+ };
742
+ ServerCertificateFile: {
743
+ type: object;
744
+ isKey: boolean;
745
+ writable: boolean;
746
+ mandatory: boolean;
747
+ collection: boolean;
748
+ private?: boolean;
749
+ credential?: boolean;
750
+ persistent?: boolean;
751
+ depends?: string;
752
+ description?: string;
753
+ default?: any;
754
+ set?: Function;
755
+ get?: Function;
756
+ prepareValue?: Function;
757
+ values?: Set<any>;
758
+ externalName?: string;
759
+ env?: string[] | string;
760
+ additionalValues?: object;
761
+ };
762
+ TrustedCertificateFile: {
763
+ type: object;
764
+ isKey: boolean;
765
+ writable: boolean;
766
+ mandatory: boolean;
767
+ collection: boolean;
768
+ private?: boolean;
769
+ credential?: boolean;
770
+ persistent?: boolean;
771
+ depends?: string;
772
+ description?: string;
773
+ default?: any;
774
+ set?: Function;
775
+ get?: Function;
776
+ prepareValue?: Function;
777
+ values?: Set<any>;
778
+ externalName?: string;
779
+ env?: string[] | string;
780
+ additionalValues?: object;
781
+ };
782
+ Compression: {
783
+ type: object;
784
+ isKey: boolean;
785
+ writable: boolean;
786
+ mandatory: boolean;
787
+ collection: boolean;
788
+ private?: boolean;
789
+ credential?: boolean;
790
+ persistent?: boolean;
791
+ depends?: string;
792
+ description?: string;
793
+ default?: any;
794
+ set?: Function;
795
+ get?: Function;
796
+ prepareValue?: Function;
797
+ values?: Set<any>;
798
+ externalName?: string;
799
+ env?: string[] | string;
800
+ additionalValues?: object;
801
+ };
802
+ ForceCompression: {
803
+ type: object;
804
+ isKey: boolean;
805
+ writable: boolean;
806
+ mandatory: boolean;
807
+ collection: boolean;
808
+ private?: boolean;
809
+ credential?: boolean;
810
+ persistent?: boolean;
811
+ depends?: string;
812
+ description?: string;
813
+ default?: any;
814
+ set?: Function;
815
+ get?: Function;
816
+ prepareValue?: Function;
817
+ values?: Set<any>;
818
+ externalName?: string;
819
+ env?: string[] | string;
820
+ additionalValues?: object;
821
+ };
724
822
  };
725
823
  };
726
824
  get type(): string;