pmcf 3.18.10 → 3.19.0

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 (5) hide show
  1. package/package.json +2 -2
  2. package/src/services/systemd-journal-remote.mjs +40 -3
  3. package/src/services/systemd-journal.mjs +19 -7
  4. package/types/services/systemd-journal-remote.d.mts +200 -2
  5. package/types/services/systemd-journal.d.mts +63 -5
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pmcf",
3
- "version": "3.18.10",
3
+ "version": "3.19.0",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -55,7 +55,7 @@
55
55
  "dependencies": {
56
56
  "ip-utilties": "^2.0.2",
57
57
  "npm-pkgbuild": "^19.1.2",
58
- "pacc": "^6.6.3",
58
+ "pacc": "^6.7.0",
59
59
  "package-directory": "^8.1.0"
60
60
  },
61
61
  "devDependencies": {
package/src/services/systemd-journal-remote.mjs CHANGED
@@ -1,4 +1,9 @@
1
- import { getAttributesJSON, addType, string_attribute_writable } from "pacc";
1
+ import {
2
+ getAttributesJSON,
3
+ addType,
4
+ string_attribute_writable,
5
+ boolean_attribute_writable
6
+ } from "pacc";
2
7
  import { Service, ServiceTypeDefinition, addServiceType } from "pmcf";
3
8
 
4
9
  const SystemdJournalRemoteServiceTypeDefinition = {
@@ -8,8 +13,40 @@ const SystemdJournalRemoteServiceTypeDefinition = {
8
13
  owners: ServiceTypeDefinition.owners,
9
14
  key: "name",
10
15
  attributes: {
11
- ServerCertificateFile: string_attribute_writable,
12
- ServerKeyFile: string_attribute_writable
16
+ Seal: {
17
+ ...boolean_attribute_writable
18
+ },
19
+ SplitMode: {
20
+ ...string_attribute_writable
21
+ },
22
+ ServerKeyFile: {
23
+ ...string_attribute_writable
24
+ // default: "/etc/ssl/private/journal-upload.pem"
25
+ },
26
+ ServerCertificateFile: {
27
+ ...string_attribute_writable
28
+ // default: "/etc/ssl/certs/journal-upload.pem"
29
+ },
30
+ TrustedCertificateFile: {
31
+ ...string_attribute_writable
32
+ // default: "/etc/ssl/ca/trusted.pem"
33
+ },
34
+ MaxUse: {
35
+ ...string_attribute_writable
36
+ },
37
+ KeepFree: {
38
+ ...string_attribute_writable
39
+ },
40
+ MaxFileSize: {
41
+ ...string_attribute_writable
42
+ },
43
+ MaxFiles: {
44
+ ...string_attribute_writable
45
+ },
46
+ Compression: {
47
+ ...string_attribute_writable
48
+ // default: "zstd lz4 xz"
49
+ }
13
50
  },
14
51
 
15
52
  service: {
package/src/services/systemd-journal.mjs CHANGED
@@ -1,4 +1,9 @@
1
- import { addType } from "pacc";
1
+ import {
2
+ addType,
3
+ getAttributesJSON,
4
+ string_attribute_writable,
5
+ duration_attribute_writable
6
+ } from "pacc";
2
7
  import { Service, ServiceTypeDefinition } from "pmcf";
3
8
 
4
9
  const SystemdJournalServiceTypeDefinition = {
@@ -6,7 +11,18 @@ const SystemdJournalServiceTypeDefinition = {
6
11
  extends: ServiceTypeDefinition,
7
12
  specializationOf: ServiceTypeDefinition,
8
13
  owners: ServiceTypeDefinition.owners,
9
- key: "name"
14
+ key: "name",
15
+ attributes: {
16
+ Compress: {
17
+ ...string_attribute_writable
18
+ },
19
+ SystemMaxUse: {
20
+ ...string_attribute_writable
21
+ },
22
+ SyncIntervalSec: {
23
+ ...duration_attribute_writable
24
+ }
25
+ }
10
26
  };
11
27
 
12
28
  export class SystemdJournalService extends Service {
@@ -32,11 +48,7 @@ export class SystemdJournalService extends Service {
32
48
  configFileName: `etc/systemd/journal.conf.d/${name}.conf`,
33
49
  content: [
34
50
  "Journal",
35
- {
36
- Compress: "yes",
37
- SystemMaxUse: "500M",
38
- SyncIntervalSec: "15m"
39
- }
51
+ getAttributesJSON(this, SystemdJournalServiceTypeDefinition.attributes)
40
52
  ]
41
53
  };
42
54
  }
package/types/services/systemd-journal-remote.d.mts CHANGED
@@ -717,8 +717,206 @@ export class SystemdJournalRemoteService extends Service {
717
717
  })[];
718
718
  key: string;
719
719
  attributes: {
720
- ServerCertificateFile: import("pacc").AttributeDefinition;
721
- ServerKeyFile: import("pacc").AttributeDefinition;
720
+ Seal: {
721
+ type: object;
722
+ isKey: boolean;
723
+ writable: boolean;
724
+ mandatory: boolean;
725
+ collection: boolean;
726
+ private?: boolean;
727
+ credential?: boolean;
728
+ persistent?: boolean;
729
+ depends?: string;
730
+ description?: string;
731
+ default?: any;
732
+ set?: Function;
733
+ get?: Function;
734
+ prepareValue?: Function;
735
+ values?: Set<any>;
736
+ externalName?: string;
737
+ env?: string[] | string;
738
+ additionalValues?: object;
739
+ };
740
+ SplitMode: {
741
+ type: object;
742
+ isKey: boolean;
743
+ writable: boolean;
744
+ mandatory: boolean;
745
+ collection: boolean;
746
+ private?: boolean;
747
+ credential?: boolean;
748
+ persistent?: boolean;
749
+ depends?: string;
750
+ description?: string;
751
+ default?: any;
752
+ set?: Function;
753
+ get?: Function;
754
+ prepareValue?: Function;
755
+ values?: Set<any>;
756
+ externalName?: string;
757
+ env?: string[] | string;
758
+ additionalValues?: object;
759
+ };
760
+ ServerKeyFile: {
761
+ type: object;
762
+ isKey: boolean;
763
+ writable: boolean;
764
+ mandatory: boolean;
765
+ collection: boolean;
766
+ private?: boolean;
767
+ credential?: boolean;
768
+ persistent?: boolean;
769
+ depends?: string;
770
+ description?: string;
771
+ default?: any;
772
+ set?: Function;
773
+ get?: Function;
774
+ prepareValue?: Function;
775
+ values?: Set<any>;
776
+ externalName?: string;
777
+ env?: string[] | string;
778
+ additionalValues?: object;
779
+ };
780
+ ServerCertificateFile: {
781
+ type: object;
782
+ isKey: boolean;
783
+ writable: boolean;
784
+ mandatory: boolean;
785
+ collection: boolean;
786
+ private?: boolean;
787
+ credential?: boolean;
788
+ persistent?: boolean;
789
+ depends?: string;
790
+ description?: string;
791
+ default?: any;
792
+ set?: Function;
793
+ get?: Function;
794
+ prepareValue?: Function;
795
+ values?: Set<any>;
796
+ externalName?: string;
797
+ env?: string[] | string;
798
+ additionalValues?: object;
799
+ };
800
+ TrustedCertificateFile: {
801
+ type: object;
802
+ isKey: boolean;
803
+ writable: boolean;
804
+ mandatory: boolean;
805
+ collection: boolean;
806
+ private?: boolean;
807
+ credential?: boolean;
808
+ persistent?: boolean;
809
+ depends?: string;
810
+ description?: string;
811
+ default?: any;
812
+ set?: Function;
813
+ get?: Function;
814
+ prepareValue?: Function;
815
+ values?: Set<any>;
816
+ externalName?: string;
817
+ env?: string[] | string;
818
+ additionalValues?: object;
819
+ };
820
+ MaxUse: {
821
+ type: object;
822
+ isKey: boolean;
823
+ writable: boolean;
824
+ mandatory: boolean;
825
+ collection: boolean;
826
+ private?: boolean;
827
+ credential?: boolean;
828
+ persistent?: boolean;
829
+ depends?: string;
830
+ description?: string;
831
+ default?: any;
832
+ set?: Function;
833
+ get?: Function;
834
+ prepareValue?: Function;
835
+ values?: Set<any>;
836
+ externalName?: string;
837
+ env?: string[] | string;
838
+ additionalValues?: object;
839
+ };
840
+ KeepFree: {
841
+ type: object;
842
+ isKey: boolean;
843
+ writable: boolean;
844
+ mandatory: boolean;
845
+ collection: boolean;
846
+ private?: boolean;
847
+ credential?: boolean;
848
+ persistent?: boolean;
849
+ depends?: string;
850
+ description?: string;
851
+ default?: any;
852
+ set?: Function;
853
+ get?: Function;
854
+ prepareValue?: Function;
855
+ values?: Set<any>;
856
+ externalName?: string;
857
+ env?: string[] | string;
858
+ additionalValues?: object;
859
+ };
860
+ MaxFileSize: {
861
+ type: object;
862
+ isKey: boolean;
863
+ writable: boolean;
864
+ mandatory: boolean;
865
+ collection: boolean;
866
+ private?: boolean;
867
+ credential?: boolean;
868
+ persistent?: boolean;
869
+ depends?: string;
870
+ description?: string;
871
+ default?: any;
872
+ set?: Function;
873
+ get?: Function;
874
+ prepareValue?: Function;
875
+ values?: Set<any>;
876
+ externalName?: string;
877
+ env?: string[] | string;
878
+ additionalValues?: object;
879
+ };
880
+ MaxFiles: {
881
+ type: object;
882
+ isKey: boolean;
883
+ writable: boolean;
884
+ mandatory: boolean;
885
+ collection: boolean;
886
+ private?: boolean;
887
+ credential?: boolean;
888
+ persistent?: boolean;
889
+ depends?: string;
890
+ description?: string;
891
+ default?: any;
892
+ set?: Function;
893
+ get?: Function;
894
+ prepareValue?: Function;
895
+ values?: Set<any>;
896
+ externalName?: string;
897
+ env?: string[] | string;
898
+ additionalValues?: object;
899
+ };
900
+ Compression: {
901
+ type: object;
902
+ isKey: boolean;
903
+ writable: boolean;
904
+ mandatory: boolean;
905
+ collection: boolean;
906
+ private?: boolean;
907
+ credential?: boolean;
908
+ persistent?: boolean;
909
+ depends?: string;
910
+ description?: string;
911
+ default?: any;
912
+ set?: Function;
913
+ get?: Function;
914
+ prepareValue?: Function;
915
+ values?: Set<any>;
916
+ externalName?: string;
917
+ env?: string[] | string;
918
+ additionalValues?: object;
919
+ };
722
920
  };
723
921
  service: {
724
922
  services: {
package/types/services/systemd-journal.d.mts CHANGED
@@ -712,17 +712,75 @@ export class SystemdJournalService extends Service {
712
712
  };
713
713
  })[];
714
714
  key: string;
715
+ attributes: {
716
+ Compress: {
717
+ type: object;
718
+ isKey: boolean;
719
+ writable: boolean;
720
+ mandatory: boolean;
721
+ collection: boolean;
722
+ private?: boolean;
723
+ credential?: boolean;
724
+ persistent?: boolean;
725
+ depends?: string;
726
+ description?: string;
727
+ default?: any;
728
+ set?: Function;
729
+ get?: Function;
730
+ prepareValue?: Function;
731
+ values?: Set<any>;
732
+ externalName?: string;
733
+ env?: string[] | string;
734
+ additionalValues?: object;
735
+ };
736
+ SystemMaxUse: {
737
+ type: object;
738
+ isKey: boolean;
739
+ writable: boolean;
740
+ mandatory: boolean;
741
+ collection: boolean;
742
+ private?: boolean;
743
+ credential?: boolean;
744
+ persistent?: boolean;
745
+ depends?: string;
746
+ description?: string;
747
+ default?: any;
748
+ set?: Function;
749
+ get?: Function;
750
+ prepareValue?: Function;
751
+ values?: Set<any>;
752
+ externalName?: string;
753
+ env?: string[] | string;
754
+ additionalValues?: object;
755
+ };
756
+ SyncIntervalSec: {
757
+ type: object;
758
+ isKey: boolean;
759
+ writable: boolean;
760
+ mandatory: boolean;
761
+ collection: boolean;
762
+ private?: boolean;
763
+ credential?: boolean;
764
+ persistent?: boolean;
765
+ depends?: string;
766
+ description?: string;
767
+ default?: any;
768
+ set?: Function;
769
+ get?: Function;
770
+ prepareValue?: Function;
771
+ values?: Set<any>;
772
+ externalName?: string;
773
+ env?: string[] | string;
774
+ additionalValues?: object;
775
+ };
776
+ };
715
777
  };
716
778
  get type(): string;
717
779
  get systemdServices(): string;
718
780
  systemdConfigs(name: any): {
719
781
  serviceName: string;
720
782
  configFileName: string;
721
- content: (string | {
722
- Compress: string;
723
- SystemMaxUse: string;
724
- SyncIntervalSec: string;
725
- })[];
783
+ content: any[];
726
784
  };
727
785
  }
728
786
  import { Service } from "pmcf";