pmcf 6.9.1 → 6.10.1

package/README.md

@@ -77,26 +77,26 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-13)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-14)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-15)
+        *   [Parameters](#parameters-14)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-16)
+        *   [Parameters](#parameters-15)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-17)
+    *   [Parameters](#parameters-16)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-18)
+    *   [Parameters](#parameters-17)
 *   [cidrAddresses](#cidraddresses)
-    *   [Parameters](#parameters-19)
+    *   [Parameters](#parameters-18)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-19)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
@@ -286,18 +286,6 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 *   `directory`   (optional, default `"/"`)
 
-## SkeletonNetworkInterface
-
-**Extends ServiceOwner**
-
-### networkAddresses
-
-#### Parameters
-
-*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
-
-Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
-
 ## SystemdJournalRemoteService
 
 **Extends CoreService**
@@ -373,6 +361,18 @@ Returns **Iterable<[string](https://developer.mozilla.org/docs/Web/JavaScript/Re
 
 Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
 
+## SkeletonNetworkInterface
+
+**Extends ServiceOwner**
+
+### networkAddresses
+
+#### Parameters
+
+*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
+
+Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
+
 ## families
 
 Returns **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;

package/package.json

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

package/src/cluster.mjs

@@ -64,7 +64,7 @@ export class Cluster extends Host {
       );
       packageData.properties.name = `keepalived-${name}`;
       packageData.properties.description = `${this.typeName} definitions for ${this.fullName}`;
-      packageData.properties.groups.push("service-config", name, "keepalived");
+      packageData.properties.groups.push("config", name, "keepalived");
 
       const extra = [];
 

package/src/core-service.mjs

@@ -75,7 +75,9 @@ export class CoreService extends Base {
     alias: { ...string_attribute_writable, name: "alias" },
     priority: priority_attribute,
     weight: { ...number_attribute_writable, name: "weight" /*default: 1*/ },
-    systemdService: { ...string_attribute_writable, name: "systemdService" }
+    systemdService: { ...string_attribute_writable, name: "systemdService" },
+    systemUserName: { ...string_attribute_writable, name: "systemUserName" },
+    systemGroupName: { ...string_attribute_writable, name: "systemGroupName" }
   };
 
   static {
@@ -91,6 +93,22 @@ export class CoreService extends Base {
     return `${this.fullName}(${this.type})`;
   }
 
+  set systemUserName(value) {
+    this._systemUserName = value;
+  }
+
+  get systemUserName() {
+    return this.attribute("_systemUserName") ?? super.systemUserName;
+  }
+
+  set systemGroupName(value) {
+    this._systemGroupName = value;
+  }
+
+  get systemGroupName() {
+    return this.attribute("_systemGroupName") ?? super.systemGroupName;
+  }
+
   get network() {
     return this.host.network;
   }
@@ -262,7 +280,7 @@ export class CoreService extends Base {
     const name = `${this.owner.owner.name}-${this.owner.name}`;
     packageData.properties.name = `${this.name}-${name}`;
     packageData.properties.description = `${this.type} service definitions for ${this.fullName}`;
-    packageData.properties.groups.push("service-config", name);
+    packageData.properties.groups.push("config", name);
     return packageData;
   }
 

package/src/services/bind.mjs

@@ -479,6 +479,14 @@ export class bind extends ExtraSourceService {
     return this.primaries ? "secondary" : "primary";
   }
 
+  get systemUserName() {
+    return "named";
+  }
+
+  get systemGroupName() {
+    return "named";
+  }
+
   async writeForwarders(outputControl) {
     const forwarders = serviceEndpoints(this.source, {
       services: "services[types[dns] && priority>=100 && priority<200]",

package/src/subnet.mjs

@@ -1,6 +1,5 @@
 import {
   normalizeCIDR,
-  isLinkLocal,
   rangeIP,
   decodeIP,
   familyIP,
@@ -82,10 +81,6 @@ export class Subnet {
     return matchPrefixIP(this.address, this.prefixLength, address);
   }
 
-  get isLinkLocal() {
-    return isLinkLocal(this.address);
-  }
-
   get addressRange() {
     return rangeIP(this.prefix, this.prefixLength, 1, 1).map(a => decodeIP(a));
   }