pmcf 2.17.0 → 2.18.0

package/package.json

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

package/src/services/dns.mjs

@@ -170,10 +170,10 @@ export class DNSService extends ExtraSourceService {
   async *preparePackages(dir) {
     const location = this.owner.owner;
     const name = location.name;
-    const p1 = join(dir, "p1");
+    const p1 = join(dir, "p1") + "/";
     const packageData = {
       dir: p1,
-      sources: [new FileContentProvider(p1 + "/")],
+      sources: [new FileContentProvider(p1)],
       outputs: this.outputs,
       properties: {
         name: `named-${name}`,
@@ -207,10 +207,10 @@ export class DNSService extends ExtraSourceService {
       yield packageData;
     }
 
-    const p2 = join(dir, "p2");
+    const p2 = join(dir, "p2") + "/";
 
+    packageData.dir = p2;
     packageData.properties = {
-      dir: p2,
       name: `named-zones-${name}`,
       description: `zone definitions for ${location.fullName}`,
       dependencies: ["mf-named"],
@@ -221,7 +221,7 @@ export class DNSService extends ExtraSourceService {
 
     packageData.sources = [
       new FileContentProvider(
-        p2 + "/",
+        p2,
         {
           mode: 0o644,
           owner: "named",
@@ -272,12 +272,6 @@ async function generateZoneDefs(dns, location, packageData) {
         records: new Set([SOARecord, NSRecord])
       };
 
-      addHook(
-        packageData.properties.hooks,
-        "post_upgrade",
-        `rm -f /var/lib/named/${zone.file}.jnl`
-      );
-
       const config = {
         name: `${domain}.zone.conf`,
         zones: [zone]
@@ -296,11 +290,17 @@ async function generateZoneDefs(dns, location, packageData) {
     }
   }
 
-  if (configs.length > 0) {
+  const foreignZones = configs.map(c => c.zones).flat();
+
+  if (foreignZones.length) {
     addHook(
       packageData.properties.hooks,
       "post_upgrade",
-      "systemctl try-reload-or-restart named"
+      `rm -f ${foreignZones.map(zone => `/var/lib/named/${zone.file}.jnl`)}\n` +
+        "systemctl try-reload-or-restart named\n" +
+        `/usr/bin/named-hostname-info ${foreignZones
+          .map(zone => zone.id)
+          .join(" ")}|/usr/bin/named-hostname-update`
     );
   }