pmcf 6.46.12 → 6.48.0

package/README.md

@@ -44,82 +44,81 @@ generates config packages for:
 *   [base](#base)
     *   [enabled](#enabled)
     *   [priority](#priority)
-    *   [templateContentAttributes](#templatecontentattributes)
-        *   [Parameters](#parameters)
     *   [templateContent](#templatecontent)
+        *   [Parameters](#parameters)
     *   [isTemplate](#istemplate)
 *   [access](#access)
 *   [loadHooks](#loadhooks)
-    *   [Parameters](#parameters-1)
+    *   [Parameters](#parameters)
 *   [serviceEndpoints](#serviceendpoints)
-    *   [Parameters](#parameters-2)
+    *   [Parameters](#parameters-1)
 *   [attributeIterator](#attributeiterator)
-    *   [Parameters](#parameters-3)
+    *   [Parameters](#parameters-2)
 *   [getAttributes](#getattributes)
-    *   [Parameters](#parameters-4)
+    *   [Parameters](#parameters-3)
 *   [property](#property)
-    *   [Parameters](#parameters-5)
+    *   [Parameters](#parameters-4)
 *   [attribute](#attribute)
-    *   [Parameters](#parameters-6)
+    *   [Parameters](#parameters-5)
 *   [walkDirections](#walkdirections)
-    *   [Parameters](#parameters-7)
+    *   [Parameters](#parameters-6)
 *   [mapFromDirections](#mapfromdirections)
-    *   [Parameters](#parameters-8)
+    *   [Parameters](#parameters-7)
 *   [unionFromDirections](#unionfromdirections)
-    *   [Parameters](#parameters-9)
+    *   [Parameters](#parameters-8)
 *   [expand](#expand)
-    *   [Parameters](#parameters-10)
+    *   [Parameters](#parameters-9)
 *   [expression](#expression)
-    *   [Parameters](#parameters-11)
+    *   [Parameters](#parameters-10)
 *   [isTemplate](#istemplate-1)
 *   [PortEndpoint](#portendpoint)
-    *   [Parameters](#parameters-12)
+    *   [Parameters](#parameters-11)
     *   [port](#port)
     *   [socketAddress](#socketaddress)
 *   [HTTPEndpoint](#httpendpoint)
-    *   [Parameters](#parameters-13)
+    *   [Parameters](#parameters-12)
     *   [port](#port-1)
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
-    *   [Parameters](#parameters-14)
+    *   [Parameters](#parameters-13)
 *   [SkeletonNetworkInterface](#skeletonnetworkinterface)
     *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-15)
+        *   [Parameters](#parameters-14)
 *   [zones](#zones)
 *   [addressesStatement](#addressesstatement)
-    *   [Parameters](#parameters-16)
+    *   [Parameters](#parameters-15)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-17)
+        *   [Parameters](#parameters-16)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-18)
+        *   [Parameters](#parameters-17)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-19)
+    *   [Parameters](#parameters-18)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-20)
+    *   [Parameters](#parameters-19)
 *   [cidrAddresses](#cidraddresses)
-    *   [Parameters](#parameters-21)
+    *   [Parameters](#parameters-20)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
 *   [subnetForAddress](#subnetforaddress)
-    *   [Parameters](#parameters-22)
+    *   [Parameters](#parameters-21)
 *   [ServiceType](#servicetype)
     *   [Properties](#properties-2)
 *   [serviceTypeEndpoints](#servicetypeendpoints)
-    *   [Parameters](#parameters-23)
+    *   [Parameters](#parameters-22)
 *   [domainName](#domainname)
-    *   [Parameters](#parameters-24)
+    *   [Parameters](#parameters-23)
 *   [domainFromDominName](#domainfromdominname)
-    *   [Parameters](#parameters-25)
+    *   [Parameters](#parameters-24)
 *   [sectionLines](#sectionlines)
-    *   [Parameters](#parameters-26)
+    *   [Parameters](#parameters-25)
 
 ## base
 
@@ -136,15 +135,11 @@ Returns **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/
 
 Returns **[number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)** 
 
-### templateContentAttributes
+### templateContent
 
 #### Parameters
 
-*   `dir` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
-
-Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
-
-### templateContent
+*   `content`  
 
 Returns **AsyncIterable\<ContentProvider>**&#x20;
 
@@ -312,18 +307,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;
-
 ## zones
 
 Type: [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)\<bind\_zone>
@@ -414,6 +397,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.46.12",
+  "version": "6.48.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,
@@ -13,6 +12,7 @@ import {
   string_attribute_writable,
   boolean_attribute,
   boolean_attribute_writable_false,
+  boolean_attribute_writable_true,
   integer_attribute_writable,
   integer_attribute,
   secret_attribute_writable,
@@ -159,8 +159,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;
 
@@ -190,7 +189,7 @@ class bind_zone_config extends base {
               )
             );
 
-           // content.push(`update-policy { grant updates zonesub ANY; };`);
+            // content.push(`update-policy { grant updates zonesub ANY; };`);
             break;
           case SECONDARY:
             const primaries = endpointAddresses(this.service.primaries);
@@ -312,8 +311,8 @@ export class bind_acl extends bind_object {
 const acl_attribute = {
   ...default_attribute_writable,
   type: bind_object,
-  name: "acl",
-//  default: "'any'"
+  name: "acl"
+  //  default: "'any'"
 };
 
 class bind_view extends bind_object {
@@ -369,6 +368,14 @@ class bind_view extends bind_object {
       type: bind_view
     },
     notify: { ...boolean_attribute_writable_false, name: "notify" },
+    hasForeignDomains: {
+      ...boolean_attribute_writable_false,
+      name: "hasForeignDomains"
+    },
+    hasBaseRecords: {
+      ...boolean_attribute_writable_true,
+      name: "hasBaseRecords"
+    },
     hasCatalog: { ...boolean_attribute_writable_false, name: "hasCatalog" },
     hasReverse: { ...boolean_attribute_writable_false, name: "hasReverse" },
     hasSVRRecords: {
@@ -508,117 +515,125 @@ class bind_view extends bind_object {
               )
             );
 
-            let reverseZone;
+            if (this.hasBaseRecords) {
+              let reverseZone;
 
-            if (this.hasReverse && na.subnet.prefix) {
-              let subnet;
+              if (this.hasReverse && na.subnet.prefix) {
+                let subnet;
 
-              for (const s of subnets) {
-                if (s.isIncluded(na.subnet)) {
-                  subnet = s;
+                for (const s of subnets) {
+                  if (s.isIncluded(na.subnet)) {
+                    subnet = s;
+                  }
                 }
-              }
-
-              if (!subnet) {
-                subnet = na.subnet;
-                subnets.add(subnet);
-              }
 
-              reverseZone = this._zones.getOrInsertComputed(
-                reverseArpa(subnet.prefix),
-                domain =>
-                  this.intoCatalog(
-                    new bind_zone(this, domain, config, locationName),
-                    locationName
-                  )
-              );
-            }
-
-            if (!hosts.has(host)) {
-              hosts.add(host);
-
-              for (let foreignDomain of host.foreignDomainNames) {
-                const wildcard = foreignDomain.startsWith("*.");
-                if (wildcard) {
-                  foreignDomain = foreignDomain.substring(2);
+                if (!subnet) {
+                  subnet = na.subnet;
+                  subnets.add(subnet);
                 }
 
-                this.foreignDomains.add(foreignDomain);
-
-                const config = this.zoneConfigs.getOrInsertComputed(
-                  foreignDomain,
-                  domain => new bind_zone_config(this, `${domain}.zone.conf`)
-                );
-
-                config.foreign = true;
-                const zone = this._zones.getOrInsertComputed(
-                  foreignDomain,
+                reverseZone = this._zones.getOrInsertComputed(
+                  reverseArpa(subnet.prefix),
                   domain =>
                     this.intoCatalog(
                       new bind_zone(this, domain, config, locationName),
                       locationName
                     )
                 );
+              }
+            }
 
-                zone.foreign = true;
+            if (!hosts.has(host)) {
+              hosts.add(host);
 
-                for (const na of host.networkAddresses(
-                  na => na.networkInterface.kind !== "loopback"
-                )) {
-                  zone.records.add(
-                    DNSRecord(
-                      "@",
-                      dnsRecordTypeForAddressFamily(na.family),
-                      na.address
-                    )
+              if (this.hasForeignDomains) {
+                for (let foreignDomain of host.foreignDomainNames) {
+                  const wildcard = foreignDomain.startsWith("*.");
+                  if (wildcard) {
+                    foreignDomain = foreignDomain.substring(2);
+                  }
+
+                  this.foreignDomains.add(foreignDomain);
+
+                  const config = this.zoneConfigs.getOrInsertComputed(
+                    foreignDomain,
+                    domain => new bind_zone_config(this, `${domain}.zone.conf`)
                   );
 
-                  if (wildcard) {
+                  config.foreign = true;
+                  const zone = this._zones.getOrInsertComputed(
+                    foreignDomain,
+                    domain =>
+                      this.intoCatalog(
+                        new bind_zone(this, domain, config, locationName),
+                        locationName
+                      )
+                  );
+
+                  zone.foreign = true;
+
+                  for (const na of host.networkAddresses(
+                    na => na.networkInterface.kind !== "loopback"
+                  )) {
                     zone.records.add(
                       DNSRecord(
-                        "*",
+                        "@",
                         dnsRecordTypeForAddressFamily(na.family),
                         na.address
                       )
                     );
+
+                    if (wildcard) {
+                      zone.records.add(
+                        DNSRecord(
+                          "*",
+                          dnsRecordTypeForAddressFamily(na.family),
+                          na.address
+                        )
+                      );
+                    }
                   }
                 }
               }
 
-              const sm = new Map();
+              if (this.hasBaseRecords) {
+                const sm = new Map();
 
-              for (const service of host.services.values()) {
-                for (const record of service.dnsRecordsForDomainName(
-                  host.domainName,
-                  this.hasSVRRecords
-                )) {
-                  sm.set(record.toString(), record);
+                for (const service of host.services.values()) {
+                  for (const record of service.dnsRecordsForDomainName(
+                    host.domainName,
+                    this.hasSVRRecords
+                  )) {
+                    sm.set(record.toString(), record);
+                  }
                 }
-              }
 
-              for (const r of sm.values()) {
-                zone.records.add(r);
+                for (const r of sm.values()) {
+                  zone.records.add(r);
+                }
               }
             }
 
-            for (const domainName of na.domainNames) {
-              if (domainName.endsWith(domain) && domainName[0] !== "*") {
-                zone.records.add(
-                  DNSRecord(
-                    dnsFullName(domainName),
-                    dnsRecordTypeForAddressFamily(na.family),
-                    address
-                  )
-                );
-
-                if (reverseZone) {
-                  reverseZone.records.add(
+            if (this.hasBaseRecords) {
+              for (const domainName of na.domainNames) {
+                if (domainName.endsWith(domain) && domainName[0] !== "*") {
+                  zone.records.add(
                     DNSRecord(
-                      dnsFullName(reverseArpa(address)),
-                      "PTR",
-                      dnsFullName(domainName)
+                      dnsFullName(domainName),
+                      dnsRecordTypeForAddressFamily(na.family),
+                      address
                     )
                   );
+
+                  if (reverseZone) {
+                    reverseZone.records.add(
+                      DNSRecord(
+                        dnsFullName(reverseArpa(address)),
+                        "PTR",
+                        dnsFullName(domainName)
+                      )
+                    );
+                  }
                 }
               }
             }
@@ -631,11 +646,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,7 +676,7 @@ 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) {
+      if (value instanceof bind_key) {
         return `key ${value.name}`;
       }
       return value.name ?? value.address;
@@ -794,21 +809,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"),