pmcf 6.10.4 → 6.11.0

package/package.json

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

package/src/core-service.mjs

@@ -93,22 +93,6 @@ 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;
   }
@@ -275,6 +259,30 @@ export class CoreService extends Base {
     );
   }
 
+  set systemUserName(value) {
+    this._systemUserName = value;
+  }
+
+  get systemUserName() {
+    return (
+      this.attribute("_systemUserName") ??
+      ServiceTypes[this.type]?.systemUserName ??
+      super.systemUserName
+    );
+  }
+
+  set systemGroupName(value) {
+    this._systemGroupName = value;
+  }
+
+  get systemGroupName() {
+    return (
+      this.attribute("_systemGroupName") ??
+      ServiceTypes[this.type]?.systemGroupName ??
+      super.systemGroupName
+    );
+  }
+
   get packageData() {
     const packageData = super.packageData;
     const name = `${this.owner.owner.name}-${this.owner.name}`;

package/src/services/bind.mjs

@@ -122,9 +122,16 @@ class bind_group extends Base {
   hasCatalog = true;
   hasSVRRecords = true;
   hasLinkLocalAdresses = bind_group.attributes.hasLinkLocalAdresses.default;
-
   recordTTL = "1W";
 
+  get type() {
+    if (this.entries.length > 0 || this.sharedWith) {
+      return "view";
+    }
+
+    return "unknown";
+  }
+
   get service() {
     return this.owner;
   }
@@ -157,9 +164,28 @@ class bind_group extends Base {
 
   async packageContent(outputControl) {
     return (
-      (await this.generateACLs(outputControl)) &&
-      (await this.generateZoneDefs(outputControl, this.entries))
-    );
+      await Promise.all([
+        this.generateACLs(outputControl),
+        this.generateTypeDefinition(outputControl),
+        this.generateZoneDefs(outputControl, this.entries)
+      ])
+    ).find(r => r)
+      ? true
+      : false;
+  }
+
+  async generateTypeDefinition(outputControl) {
+    if (this.type === "view") {
+      await writeLines(
+        join(outputControl.dir, "etc/named/views"),
+        `gen-${this.name}.conf`,
+        [
+          `view ${this.name} {`,
+          `include "/etc/named/views/${this.name}/*.conf";`,
+          "};"
+        ]
+      );
+    }
   }
 
   async generateACLs(outputControl) {
@@ -439,8 +465,10 @@ export class bind extends ExtraSourceService {
     }
   };
   static service = {
-    systemdService: "bind.service",
     extends: ["dns"],
+    systemdService: "named.service",
+    systemUserName: "named",
+    systemGroupName: "named",
     services: {
       "bind-statistics": {
         endpoints: [
@@ -486,14 +514,6 @@ 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]",
@@ -542,58 +562,6 @@ export class bind extends ExtraSourceService {
       console.log(packageData);
       yield packageData;
     }
-
-    /*
-    const sources = this.zones.length ? this.zones : [this.owner];
-    const names = sources.map(a => a.fullName).join(" ");
-    const name = this.owner.owner.name || this.owner.name;
-
-    Object.assign(packageData.properties, {
-      name: `named-${name}`,
-      description: `named definitions for ${names}`
-    });
-
-    const ownerAndGroup = { owner: "named", group: "named" };
-    const filePermissions = [
-      { ...ownerAndGroup, mode: 0o644 },
-      { ...ownerAndGroup, mode: 0o755 }
-    ];
-
-    const zonesPackageDir = join(dir, "zones") + "/";
-
-    packageData.sources = [
-      new FileContentProvider(zonesPackageDir, ...filePermissions)
-    ];
-    packageData.properties = {
-      name: `named-zones-${name}`,
-      description: `zone definitions for ${names}`,
-      dependencies: ["mf-named"],
-      access: "private"
-    };
-
-    yield this.generateZoneDefs(
-      newOutputControl(packageData, zonesPackageDir),
-      sources
-    );
-
-    const location = "outfacing";
-
-    const outfacingZonesPackageDir = join(dir, location) + "/";
-
-    packageData.sources = [
-      new FileContentProvider(outfacingZonesPackageDir, ...filePermissions)
-    ];
-    packageData.properties = {
-      name: `named-zones-${name}-${location}`,
-      description: `${location} zone definitions for ${names}`,
-      access: "private"
-    };
-
-    yield* this.generateOutfacingDefs(
-      newOutputControl(packageData, outfacingZonesPackageDir),
-      sources
-    );
-    */
   }
 
   async *generateOutfacingDefs(outputControl, sources) {