pmcf 6.53.0 → 6.53.2

package/package.json

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

package/src/content.mjs

@@ -67,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",
@@ -103,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;
@@ -205,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);
   }

package/src/services/bind.mjs

@@ -16,7 +16,8 @@ import {
   integer_attribute_writable,
   integer_attribute,
   secret_attribute_writable,
-  asArray
+  asArray,
+  leafValues
 } from "pacc";
 import {
   base,
@@ -858,15 +859,25 @@ export class bind extends CoreService {
   }
 
   async writeServers(outputControl) {
+
+    // TODO 
+    const all = new Map();
+    for (const service of this.primaries) {
+      for (const subnet of service.host.network.subnets.values()) {
+        //console.log("SA", subnet.fullName);
+        all.set(subnet.address, service);
+      }
+    }
+
     await writeLines(
       join(outputControl.dir, "etc/named"),
       `servers.conf`,
-      asArray(this.primaries).map(service => {
+      all.entries().map(([subnet, service]) => {
         return [
-          `server ${service.address()} {`,
+          `server ${subnet} {`,
           "    keys {" +
             asArray(service.keys.values())
-            .filter(key=>key.tags.has('server'))
+              .filter(key => key.tags.has("server"))
               .map(key => ` ${key.name};`)
               .join("") +
             " };",