pmcf 2.5.1 → 2.6.0

package/package.json

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

package/src/network.mjs

@@ -5,7 +5,7 @@ import { networkProperties } from "./network-support.mjs";
 
 const NetworkTypeDefinition = {
   name: "network",
-  owners: ["location", "cluster", "owner", "root"],
+  owners: ["location", "owner", "root"],
   priority: 0.8,
   extends: Owner.typeDefinition,
   properties: {
@@ -53,6 +53,18 @@ export class Network extends Owner {
     }
   }
 
+  hosts() {
+    if (this.bridge) {
+      let hosts = new Set();
+      for (const network of this.bridge) {
+        hosts = hosts.union(network.directHosts());
+      }
+      return hosts;
+    }
+
+    return super.hosts();
+  }
+
   get bridge() {
     return this._bridge;
   }

package/src/owner.mjs

@@ -5,7 +5,7 @@ import { addType, types } from "./types.mjs";
 
 const OwnerTypeDefinition = {
   name: "owner",
-  owners: ["owner", "root"],
+  owners: ["location", "owner", "root"],
   priority: 0.9,
   extends: Base.typeDefinition,
   properties: {
@@ -137,13 +137,18 @@ export class Owner extends Base {
     return this.typeNamed("host", name) || this.typeNamed("cluster", name);
   }
 
-  hosts() {
+  directHosts() {
     let hosts = new Set();
-
     for (const type of ["host", "cluster"]) {
       hosts = hosts.union(new Set(Array.from(this.typeList(type))));
     }
 
+    return hosts;
+  }
+
+  hosts() {
+    let hosts = this.directHosts();
+
     for (const type of types.host.owners) {
       for (const object of this.typeList(type)) {
         hosts = hosts.union(object.hosts());

package/src/services/dns.mjs

@@ -16,6 +16,7 @@ import {
   ExtraSourceServiceTypeDefinition
 } from "../extra-source-service.mjs";
 import { subnets } from "../subnet.mjs";
+import { addHook } from "../hooks.mjs";
 
 const DNSServiceTypeDefinition = {
   name: "dns",
@@ -202,7 +203,8 @@ export class DNSService extends ExtraSourceService {
       description: `zone definitions for ${location.fullName}`,
       dependencies: ["mf-named"],
       replaces: ["mf-named-zones"],
-      access: "private"
+      access: "private",
+      hooks: {}
     };
 
     packageData.sources = [
@@ -257,6 +259,13 @@ async function generateZoneDefs(dns, location, packageData) {
         file: `FOREIGN/${domain}.zone`,
         records: new Set([SOARecord, NSRecord])
       };
+
+      addHook(
+        packageData.properties.hooks,
+        "post_install",
+        `rm /var/lib/named/${zone.file}.jnl`
+      );
+
       const config = {
         name: `${domain}.zone.conf`,
         zones: [zone]
@@ -273,6 +282,14 @@ async function generateZoneDefs(dns, location, packageData) {
         }
       }
     }
+
+    if (configs.length > 0) {
+      addHook(
+        packageData.properties.hooks,
+        "post_install",
+        "systemctl restart named"
+      );
+    }
   }
 
   for (const domain of dns.localDomains) {

package/types/owner.d.mts

@@ -142,6 +142,7 @@ export class Owner extends Base {
     locationNamed(name: any): any;
     locations(): any;
     hostNamed(name: any): any;
+    directHosts(): Set<any>;
     hosts(): Set<any>;
     networkNamed(name: any): any;
     networks(): any;