pmcf 6.10.3 → 6.11.0

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-14)
+        *   [Parameters](#parameters-15)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-15)
+        *   [Parameters](#parameters-16)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-16)
+    *   [Parameters](#parameters-17)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-17)
-*   [cidrAddresses](#cidraddresses)
     *   [Parameters](#parameters-18)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-19)
+*   [cidrAddresses](#cidraddresses)
+    *   [Parameters](#parameters-19)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
@@ -286,6 +286,18 @@ 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**
@@ -361,18 +373,6 @@ 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.10.3",
+  "version": "6.11.0",
   "publishConfig": {
     "access": "public"
   },
@@ -52,7 +52,7 @@
   "dependencies": {
     "aggregated-map": "^1.0.7",
     "content-entry-transform": "^1.6.9",
-    "ip-utilties": "^3.7.4",
+    "ip-utilties": "^3.7.5",
     "npm-pkgbuild": "^20.8.2",
     "pacc": "^10.4.1",
     "package-directory": "^8.2.0",

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/network-address.mjs

@@ -69,7 +69,7 @@ export function addresses(sources, options) {
           typeof object === "string" ? object : decodeIP(object.address)
         )
     )
-  ];
+  ].filter(e=>e!=='');
 }
 
 /**

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;
   }
@@ -134,7 +141,7 @@ class bind_group extends Base {
   }
 
   get defaultRecords() {
-    const nameService = this.owner; //ss[0];
+    const nameService = this.owner;
 
     console.log(
       "nameService",
@@ -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) {
@@ -372,7 +398,12 @@ class bind_group extends Base {
           content.push(`  type ${config.type};`);
           content.push(`  file \"${zone.file}\";`);
           content.push(
-            addressesStatement("  allow-update", this.allowedUpdates, "none;")
+            addressesStatement(
+              "allow-update",
+              this.allowedUpdates,
+              "none;",
+              "  "
+            )
           );
           content.push(`  notify ${yesno(this.notify)};`);
         }
@@ -403,17 +434,17 @@ class bind_group extends Base {
   }
 }
 
-function addressesStatement(prefix, objects, empty = false) {
+function addressesStatement(prefix, objects, empty = false, indent = "") {
   const body = asArray(objects).map(
-    value => `  ${typeof value === "string" ? value : value.name};`
+    value => `${indent}  ${typeof value === "string" ? value : value.name};`
   );
 
   if (body.length) {
-    return [`${prefix} {`, body, "};"];
+    return [`${indent}${prefix} {`, body, `${indent}};`];
   }
 
   if (empty) {
-    return [`${prefix} {`, empty, "};"];
+    return [`${indent}${prefix} {`, indent + "  " + empty, `${indent}};`];
   }
 
   return [];
@@ -434,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: [
@@ -481,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]",
@@ -537,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) {