pmcf 6.9.0 → 6.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.9.0",
+  "version": "6.10.0",
   "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

@@ -156,12 +156,13 @@ class bind_group extends Base {
   }
 
   async packageContent(outputControl) {
-    return await this.generateACLs(outputControl) && await this.generateZoneDefs(outputControl, this.entries);
+    return (
+      (await this.generateACLs(outputControl)) &&
+      (await this.generateZoneDefs(outputControl, this.entries))
+    );
   }
 
   async generateACLs(outputControl) {
-    console.log("generateACLs", this.name);
-
     const acls = addressesStatement(
       `acl ${this.name}`,
       addresses(this.access, { aggregate: true })
@@ -181,8 +182,6 @@ class bind_group extends Base {
   }
 
   async generateZoneDefs(outputControl, sources) {
-    console.log("generateZoneDefs", this.name);
-
     for (const source of sources) {
       console.log(
         "ZONE",
@@ -480,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]",
@@ -494,27 +501,38 @@ export class bind extends ExtraSourceService {
         `forwarders.conf`,
         addressesStatement("forwarders", forwarders)
       );
+
+      return true;
     }
 
-    return forwarders.length > 0;
+    return false;
   }
 
   async *preparePackages(dir) {
+    const permissions = this.packageContentPermissions;
     const packageData = this.packageData;
-    packageData.sources.push(new FileContentProvider(dir));
 
-    const outputControl = newOutputControl(packageData, dir);
+    packageData.sources = await Array.fromAsync(
+      this.templateContent(...permissions)
+    );
 
-    let hasContent = false;
+    let hasContent = packageData.sources.length > 0;
+
+    packageData.sources.push(
+      new FileContentProvider(dir + "/", ...permissions)
+    );
+
+    const outputControl = newOutputControl(packageData, dir);
 
     for (const group of this.groups.values()) {
       const present = await group.packageContent(outputControl);
       hasContent ||= present;
     }
 
-    hasContent ||= await this.writeForwarders(outputControl);
+    const present = await this.writeForwarders(outputControl);
 
-    if (hasContent) {
+    if (hasContent || present) {
+      console.log(packageData);
       yield packageData;
     }