pmcf 4.1.2 → 4.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.1.2",
+  "version": "4.1.3",
   "publishConfig": {
     "access": "public"
   },
@@ -55,7 +55,7 @@
   "dependencies": {
     "ip-utilties": "^2.0.2",
     "npm-pkgbuild": "^19.1.4",
-    "pacc": "^8.0.0",
+    "pacc": "^8.0.1",
     "package-directory": "^8.1.0"
   },
   "devDependencies": {

package/src/services/influxdb.mjs

@@ -14,7 +14,7 @@ const InfluxdbServiceTypeDefinition = {
   attributes: {
     "metrics-disabled": {
       ...boolean_attribute_writable_true,
-      isCommonOption: true
+      configurable: true
     }
   },
   service: {
@@ -68,7 +68,7 @@ export class InfluxdbService extends Service {
     const lines = Object.entries(InfluxdbServiceTypeDefinition.attributes)
       .filter(
         ([key, attribute]) =>
-          attribute.isCommonOption && this[key] !== undefined
+          attribute.configurable && this[key] !== undefined
       )
       .map(([key]) => `${key}: ${this[key]}`);
 

package/src/services/kea.mjs

@@ -27,27 +27,27 @@ const KeaServiceTypeDefinition = {
   attributes: {
     "ddns-send-updates": {
       ...boolean_attribute_writable_true,
-      isCommonOption: true
+      configurable: true
     },
     "renew-timer": {
       ...number_attribute_writable,
-      isCommonOption: true,
+      configurable: true,
       default: 900
     },
     "rebind-timer": {
       ...number_attribute_writable,
-      isCommonOption: true,
+      configurable: true,
       default: 1800
     },
     "valid-lifetime": {
       ...number_attribute_writable,
       mandatory: true,
-      isCommonOption: true,
+      configurable: true,
       default: 86400
     },
     "ddns-conflict-resolution-mode": {
       ...string_attribute_writable,
-      isCommonOption: true
+      configurable: true
       //values: ["check-exists-with-dhcid","no-check-with-dhcid"]
     }
   },
@@ -282,7 +282,7 @@ export class KeaService extends Service {
         KeaServiceTypeDefinition.attributes
       ).filter(
         ([key, attribute]) =>
-          attribute.isCommonOption && this[key] !== undefined
+          attribute.configurable && this[key] !== undefined
       )) {
         cfg[key] = this[key];
       }

package/src/services/systemd-resolved.mjs

@@ -1,6 +1,7 @@
 import {
   addType,
   object_attribute,
+  string_collection_attribute_writable,
   duration_attribute_writable,
   string_attribute_writable,
   boolean_attribute_writable,
@@ -32,7 +33,10 @@ const SystemdResolvedServiceTypeDefinition = {
       attributes: {*/
         DNS: { ...string_attribute_writable, configurable: true },
         FallbackDNS: { ...string_attribute_writable, configurable: true },
-        Domains: { ...string_attribute_writable, configurable: true },
+        
+        domains: { externalName: "Domains", ...string_collection_attribute_writable, configurable: true },
+
+
         MulticastDNS: { ...yesno_attribute_writable, configurable: true },
         Cache: { ...boolean_attribute_writable, configurable: true },
         CacheFromLocalhost: {
@@ -83,8 +87,6 @@ export class SystemdResolvedService extends ExtraSourceService {
     return SystemdResolvedServiceTypeDefinition.name;
   }
 
-  Resolve = {};
-
   systemdConfigs(name) {
     const options = (lower, upper, limit) => {
       return {
@@ -99,6 +101,8 @@ export class SystemdResolvedService extends ExtraSourceService {
       };
     };
 
+   //console.log([...this.owner.expression('services[in("dns",types) && priority>=300 && priority<=399].owner.name')]);
+
     return {
       serviceName: this.systemdService,
       configFileName: `etc/systemd/resolved.conf.d/${name}.conf`,
@@ -106,7 +110,6 @@ export class SystemdResolvedService extends ExtraSourceService {
       content: sectionLines("Resolve", {
         DNS: serviceEndpoints(this, options(300, 399, 4)),
         FallbackDNS: serviceEndpoints(this, options(100, 199, 4)),
-        Domains: [...this.localDomains].join(" "),
         MulticastDNS: yesno(this.network.multicastDNS),
         ...this.getProperties(filterConfigurable)
       })

package/types/services/influxdb.d.mts

@@ -744,7 +744,7 @@ export class InfluxdbService extends Service {
         key: string;
         attributes: {
             "metrics-disabled": {
-                isCommonOption: boolean;
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;

package/types/services/kea.d.mts

@@ -744,7 +744,7 @@ export class KeaService extends Service {
         key: string;
         attributes: {
             "ddns-send-updates": {
-                isCommonOption: boolean;
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -766,7 +766,7 @@ export class KeaService extends Service {
                 additionalValues?: object;
             };
             "renew-timer": {
-                isCommonOption: boolean;
+                configurable: boolean;
                 default: number;
                 type: object;
                 isKey: boolean;
@@ -788,7 +788,7 @@ export class KeaService extends Service {
                 additionalValues?: object;
             };
             "rebind-timer": {
-                isCommonOption: boolean;
+                configurable: boolean;
                 default: number;
                 type: object;
                 isKey: boolean;
@@ -811,7 +811,7 @@ export class KeaService extends Service {
             };
             "valid-lifetime": {
                 mandatory: boolean;
-                isCommonOption: boolean;
+                configurable: boolean;
                 default: number;
                 type: object;
                 isKey: boolean;
@@ -832,7 +832,7 @@ export class KeaService extends Service {
                 additionalValues?: object;
             };
             "ddns-conflict-resolution-mode": {
-                isCommonOption: boolean;
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;

package/types/services/systemd-resolved.d.mts

@@ -1279,7 +1279,7 @@ export class SystemdResolvedService extends ExtraSourceService {
                 env?: string[] | string;
                 additionalValues?: object;
             };
-            Domains: {
+            domains: {
                 configurable: boolean;
                 type: object;
                 isKey: boolean;
@@ -1297,7 +1297,7 @@ export class SystemdResolvedService extends ExtraSourceService {
                 toInternal?: Function;
                 toExternal?: Function;
                 values?: Set<any>;
-                externalName?: string;
+                externalName: string;
                 env?: string[] | string;
                 additionalValues?: object;
             };
@@ -1503,7 +1503,6 @@ export class SystemdResolvedService extends ExtraSourceService {
             systemdService: string;
         };
     };
-    Resolve: {};
     systemdConfigs(name: any): {
         serviceName: any;
         configFileName: string;