pmcf 6.46.11 → 6.47.0

package/package.json

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

package/src/base.mjs

@@ -225,17 +225,36 @@ export class base extends core {
     return this._content;
   }
 
-  get packageData() {
-    return this.content?.packageData();
-  }
-
-  async *preparePackages(stagingDir) {
-    const pd = await this.packageData;
+  async preparePackage(options) {
+    const content = this.content;
+    if (content) {
+      const pd = await content.preparePackage();
+
+      pd.sources.push(
+        ...(await Array.fromAsync(this.templateContent(content)))
+      );
+
+      switch (typeof options) {
+        case "string":
+          options = { dir: options };
+        case "object":
+          pd.sources.push(
+            new FileContentProvider({
+              pattern: ["**/*"],
+              permissions: content.permissions,
+              ...options
+            })
+          );
+      }
 
-    pd.sources.push(...(await Array.fromAsync(this.templateContent())));
+      return pd;
+    }
+  }
 
-    if (pd.sources.length) {
-      yield pd;
+  async *preparePackages(dir) {
+    const packageData = await this.preparePackage(dir);
+    if (packageData) {
+      yield packageData;
     }
   }
 
@@ -258,7 +277,7 @@ export class base extends core {
    *
    * @returns {AsyncIterable<ContentProvider>}
    */
-  async *templateContent() {
+  async *templateContent(content) {
     for (const node of this.walkDirections(["this", "extends"])) {
       const dir = join(node.directory, "content");
 
@@ -268,7 +287,7 @@ export class base extends core {
             new FileContentProvider({
               dir,
               pattern: "**/*",
-              permissions: this.content.permissions
+              permissions: content.permissions
             }),
             this.templateTransformers
           );

package/src/cluster.mjs

@@ -1,5 +1,4 @@
 import { join } from "node:path";
-import { FileContentProvider } from "npm-pkgbuild";
 import { FAMILY_IPV4 } from "ip-utilties";
 import { duration_attribute_writable } from "pacc";
 import { host } from "./host.mjs";
@@ -46,11 +45,10 @@ export class cluster extends host {
     return new Set(this.masters).union(new Set(this.backups));
   }
 
-  get isCluster()
-  {
+  get isCluster() {
     return true;
   }
-  
+
   isMember(host) {
     return super.isMember(host) || this.hosts.get(host.name) === host;
   }
@@ -71,16 +69,7 @@ export class cluster extends host {
       const host = ni.host;
 
       const packageStagingDir = join(stagingDir, host.name);
-      const packageData = await host.packageData;
-
-      packageData.sources.push(
-        ...(await Array.fromAsync(this.templateContent())),
-        new FileContentProvider({
-          dir: packageStagingDir,
-          pattern: "**/*",
-          permissions: this.content.permissions
-        })
-      );
+      const packageData = await host.preparePackage({ dir: packageStagingDir });
 
       const extra = [];
 

package/src/content.mjs

@@ -254,7 +254,7 @@ export class content extends core {
     }
   }
 
-  async packageData(node) {
+  async preparePackage() {
     const packageData = {
       sources: [],
       outputs: this.outputs,

package/src/host.mjs

@@ -1,6 +1,5 @@
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
-import { FileContentProvider } from "npm-pkgbuild";
 import { AggregatedMap } from "aggregated-map";
 import {
   string_attribute,
@@ -323,16 +322,7 @@ export class host extends ServiceOwner {
   }
 
   async *preparePackages(dir) {
-    const packageData = await this.packageData;
-
-    packageData.sources.push(
-      ...(await Array.fromAsync(this.templateContent())),
-      new FileContentProvider({
-        dir,
-        pattern: ["**/*", "**/.ssh/*"],
-        permissions: this.content.permissions
-      })
-    );
+    const packageData = await this.preparePackage({ dir,  pattern: ["**/*", "**/.ssh/*"]});
 
     for (const ni of this.networkInterfaces.values()) {
       await ni.systemdDefinitions(dir, packageData);

package/src/services/bind.mjs

@@ -1,6 +1,5 @@
 import { join } from "node:path";
 import { createHmac } from "node:crypto";
-import { FileContentProvider } from "npm-pkgbuild";
 import { reverseArpa } from "ip-utilties";
 import {
   default_collection_attribute,
@@ -159,8 +158,7 @@ class bind_zone_config extends base {
     this.name = name;
   }
 
-  async write(outputControl) {
-    const dir = outputControl.dir;
+  async write(dir) {
     const view = this.owner;
     const type = this.type;
 
@@ -185,7 +183,7 @@ class bind_zone_config extends base {
               addressesStatement(
                 "  allow-update",
                 view.allowUpdate,
-                "none;",
+                "any;",
                 "    "
               )
             );
@@ -311,9 +309,9 @@ export class bind_acl extends bind_object {
 
 const acl_attribute = {
   ...default_attribute_writable,
-  type: bind_acl,
+  type: bind_object,
   name: "acl",
-  default: "'any'"
+//  default: "'any'"
 };
 
 class bind_view extends bind_object {
@@ -631,11 +629,11 @@ class bind_view extends bind_object {
 
   async packageContent(outputControl) {
     outputControl.packageData.sources.push(
-      ...(await Array.fromAsync(this.templateContent()))
+      ...(await Array.fromAsync(this.templateContent(this.service.content)))
     );
 
     for (const config of this.zoneConfigs.values()) {
-      await config.write(outputControl);
+      await config.write(outputControl.dir);
     }
 
     if (this.foreignDomains.size) {
@@ -661,6 +659,9 @@ class bind_view extends bind_object {
 function addressesStatement(prefix, objects, empty = false, indent = "") {
   const body = asArray(objects).map(value => {
     if (typeof value !== "string") {
+      if(value instanceof bind_key) {
+        return `key ${value.name}`;
+      }
       return value.name ?? value.address;
     }
 
@@ -791,21 +792,14 @@ export class bind extends CoreService {
   }
 
   async *preparePackages(dir) {
-    const packageData = await this.packageData;
+    const packageData = await this.preparePackage(dir);
 
-    packageData.sources.push(
-      ...(await Array.fromAsync(this.templateContent()))
-    );
+    if(!packageData) {
+      return;
+    }
 
     let hasContent = packageData.sources.length > 0;
 
-    packageData.sources.push(
-      new FileContentProvider({
-        dir: dir + "/",
-        permissions: this.content.permissions
-      })
-    );
-
     const outputControl = { packageData, dir };
 
     for (const key of this.keys.values()) {

package/src/services/chrony.mjs

@@ -46,19 +46,7 @@ export class chrony extends CoreService {
   }
 
   async *preparePackages(dir) {
-    const packageData = await this.packageData;
-
-    packageData.sources.push(
-      ...(await Array.fromAsync(this.templateContent()))
-    );
-
-    packageData.sources.push(
-      new FileContentProvider({
-        dir: dir + "/",
-        permissions: this.content.permissions
-      })
-    );
-
+    const packageData = await this.preparePackage(dir);
     const subnets = [...new Map(this.subnets).values()]; // TODO should be normal
     const host = this.host;
 

package/src/services/influxdb.mjs

@@ -1,6 +1,5 @@
 import { join } from "node:path";
 import { stringify } from "yaml";
-import { FileContentProvider } from "npm-pkgbuild";
 import { boolean_attribute_writable_true } from "pacc";
 import { CoreService, addType, FAMILY_IPV4_IPV6 } from "pmcf";
 import { writeLines, filterConfigurable } from "../utils.mjs";
@@ -31,16 +30,7 @@ export class influxdb extends CoreService {
   }
 
   async *preparePackages(dir) {
-    const packageData = await this.packageData;
-
-    packageData.sources.push(
-      ...(await Array.fromAsync(this.templateContent())),
-      new FileContentProvider({
-        dir,
-        pattern: ["**/*"],
-        permissions: this.content.permissions
-      })
-    );
+    const packageData = await this.preparePackage(dir);
 
     await writeLines(
       join(dir, "etc", "influxdb"),

package/src/services/kea.mjs

@@ -1,5 +1,4 @@
 import { join } from "node:path";
-import { FileContentProvider } from "npm-pkgbuild";
 import {
   reverseArpa,
   addressType,
@@ -185,18 +184,7 @@ export class kea extends CoreService {
     const name = host.name;
     const subnets = [...this.subnets.values()];
     const dnsServerEndpoints = this.dnsServerEndpoints;
-    const packageData = await this.packageData;
-
-    packageData.sources.push(
-      ...(await Array.fromAsync(this.templateContent()))
-    );
-
-    packageData.sources.push(
-      new FileContentProvider({
-        dir: dir + "/",
-        permissions: this.content.permissions
-      })
-    );
+    const packageData = await this.preparePackage(dir);
 
     const loggers = [
       {

package/src/services/mosquitto.mjs

@@ -1,5 +1,4 @@
 import { join } from "node:path";
-import { FileContentProvider } from "npm-pkgbuild";
 import { port_attribute, string_attribute_writable } from "pacc";
 import { CoreService, addType } from "pmcf";
 import {
@@ -51,16 +50,7 @@ export class mosquitto extends CoreService {
   }
 
   async *preparePackages(dir) {
-    const packageData = await this.packageData;
-
-    packageData.sources.push(
-      ...(await Array.fromAsync(this.templateContent())),
-      new FileContentProvider({
-        dir,
-        pattern: ["**/*"],
-        permissions: this.content.permissions
-      })
-    );
+    const packageData = await this.preparePackage(dir);
 
     await writeLines(
       join(dir, "etc", "mosquitto"),

package/src/type.mjs

@@ -1,4 +1,10 @@
-import { addType as addTypeBasic, toInternal, registerToken, DOT, asArray } from "pacc";
+import {
+  addType as addTypeBasic,
+  toInternal,
+  registerToken,
+  DOT,
+  asArray
+} from "pacc";
 import { normalizeIP } from "ip-utilties";
 import { addServiceType } from "pmcf";
 
@@ -39,7 +45,10 @@ export function assign(attribute, object, value) {
 
     if (attribute.deferredExpression) {
       if (object.hasOwnProperty(attribute.name)) {
-        error(`attribute ${attribute.name} of ${object.fullName} already defined`, attribute );
+        error(
+          `attribute ${attribute.name} of ${object.fullName} already defined`,
+          attribute
+        );
       } else {
         Object.defineProperty(object, attribute.name, {
           get: () => object.expression(value)