pmcf 6.52.2 → 6.53.1

package/package.json

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

package/src/content.mjs

@@ -37,6 +37,10 @@ export class content extends core {
   static attributes = {
     name: { ...name_attribute_writable, packagingProperty: true },
     description: { ...description_attribute_writable, packagingProperty: true },
+    fragments: {
+      ...string_set_attribute_writable,
+      name: "fragments"
+    },
     permissions: {
       ...default_collection_attribute_writable,
       type: permission,
@@ -63,6 +67,11 @@ export class content extends core {
       name: "replaces",
       packagingProperty: true
     },
+    conflicts: {
+      ...string_set_attribute_writable,
+      name: "conflicts",
+      packagingProperty: true
+    },
     optional: {
       ...string_set_attribute_writable,
       name: "optional",
@@ -90,6 +99,7 @@ export class content extends core {
     addType(this);
   }
 
+  _fragments = new Set();
   _permissions = new Map();
   _packaging = new Set();
   _provides = new Set();
@@ -98,6 +108,7 @@ export class content extends core {
   _optional = new Set();
   _groups = new Set();
   _hooks = new Set();
+  _conflicts = new Set();
 
   get host() {
     return this.owner.host;
@@ -200,6 +211,16 @@ export class content extends core {
     );
   }
 
+  set conflicts(value) {
+    this._conflicts = union(value, this._conflicts);
+  }
+
+  get conflicts() {
+    return this.expand(
+      this.unionFromDirections(["this", "extends"], "_conflicts")
+    );
+  }
+
   set optional(value) {
     this._optional = union(value, this._optional);
   }
@@ -256,8 +277,19 @@ export class content extends core {
     }
   }
 
+  set fragments(value) {
+    this._fragments = union(value, this._fragments);
+  }
+
+  get fragments() {
+    return this.expand(
+      this.unionFromDirections(["this", "extends"], "_fragments")
+    );
+  }
+
   async preparePackage() {
     const packageData = {
+      fragments: this.fragments,
       sources: [],
       outputs: this.outputs,
       properties: Object.fromEntries(
@@ -265,7 +297,8 @@ export class content extends core {
           this.constructor,
           attribute => attribute.packagingProperty
         ).map(([path, attribute]) => [path[0], this[path[0]]])
-      )
+      ),
+      dir: () => this.sources?.[0].dir
     };
 
     await this.loadHooks(packageData);

package/src/services/bind.mjs

@@ -248,7 +248,7 @@ export class bind_key extends base {
       `${this.name}.conf`,
       [
         `key "${this.name}" {`,
-        `  # ` + asArray(this.tags).join(','),
+        `  # ` + asArray(this.tags).join(","),
         `  algorithm ${this.algorithm};`,
         `  secret "${this.secret}";`,
         "};"
@@ -369,7 +369,6 @@ class bind_view extends bind_object {
       name: "sharedWith",
       type: bind_view
     },
-
     matchClients: {
       ...acl_attribute,
       name: "matchClients"
@@ -697,19 +696,21 @@ class bind_view extends bind_object {
       ...(await Array.fromAsync(this.templateContent(this.service.content)))
     );
 
-    for (const config of this.zoneConfigs.values()) {
-      await config.write(outputControl.dir);
-    }
+    if (outputControl.packageData.fragments.has("zones")) {
+      for (const config of this.zoneConfigs.values()) {
+        await config.write(outputControl.dir);
+      }
 
-    if (this.foreignDomains.size) {
-      addHook(
-        outputControl.packageData,
-        "post_upgrade",
-        `/usr/bin/named-hostname-update ${[...this.foreignDomains].join(" ")}`
-      );
-    }
+      if (this.foreignDomains.size) {
+        addHook(
+          outputControl.packageData,
+          "post_upgrade",
+          `/usr/bin/named-hostname-update ${[...this.foreignDomains].join(" ")}`
+        );
+      }
 
-    return outputControl.packageData;
+      return outputControl.packageData;
+    }
   }
 }
 
@@ -865,6 +866,7 @@ export class bind extends CoreService {
           `server ${service.address()} {`,
           "    keys {" +
             asArray(service.keys.values())
+            .filter(key=>key.tags.has('server'))
               .map(key => ` ${key.name};`)
               .join("") +
             " };",
@@ -872,6 +874,7 @@ export class bind extends CoreService {
         ];
       })
     );
+    return true;
   }
 
   async *preparePackages(dir) {
@@ -885,27 +888,30 @@ export class bind extends CoreService {
 
     const outputControl = { packageData, dir };
 
-    for (const key of this.keys.values()) {
-      await key.packageContent(outputControl);
-      hasContent = true;
-    }
-
-    for (const acl of this.acls.values()) {
-      await acl.packageContent(outputControl);
-      hasContent = true;
-    }
-
     for (const view of this.views.values()) {
       const present = await view.packageContent(outputControl);
       hasContent ||= present;
     }
 
-    let present;
-    present = await this.writeServers(outputControl);
+    if (packageData.fragments.has("base")) {
+      for (const key of this.keys.values()) {
+        await key.packageContent(outputControl);
+        hasContent = true;
+      }
 
-    present = await this.writeForwarders(outputControl);
+      for (const acl of this.acls.values()) {
+        await acl.packageContent(outputControl);
+        hasContent = true;
+      }
+
+      let present;
+      present = await this.writeForwarders(outputControl);
+      hasContent ||= present;
+      present = await this.writeServers(outputControl);
+      hasContent ||= present;
+    }
 
-    if (hasContent || present) {
+    if (hasContent) {
       yield packageData;
     }
   }