pmcf 2.39.9 → 2.40.0

package/package.json

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

package/src/services/bind.mjs

@@ -221,10 +221,10 @@ export class BINDService extends ExtraSourceService {
     const names = sources.map(a => a.fullName).join(" ");
 
     const name = this.owner.owner.name;
-    const p1 = join(dir, "p1") + "/";
+    const configPackageDir = join(dir, "config") + "/";
     const packageData = {
-      dir: p1,
-      sources: [new FileContentProvider(p1)],
+      dir: configPackageDir,
+      sources: [new FileContentProvider(configPackageDir)],
       outputs: this.outputs,
       properties: {
         name: `named-${name}`,
@@ -241,7 +241,7 @@ export class BINDService extends ExtraSourceService {
 
     if (forwarders.length) {
       await writeLines(
-        join(p1, "etc/named/options"),
+        join(configPackageDir, "etc/named/options"),
         `forwarders.conf`,
         addressesStatement("forwarders", forwarders)
       );
@@ -264,15 +264,15 @@ export class BINDService extends ExtraSourceService {
     ].flat();
 
     if (acls.length) {
-      await writeLines(join(p1, "etc/named"), `0-acl-${name}.conf`, acls);
+      await writeLines(join(configPackageDir, "etc/named"), `0-acl-${name}.conf`, acls);
     }
     if (forwarders.length || acls.length) {
       yield packageData;
     }
 
-    const p2 = join(dir, "p2") + "/";
+    const zonesPackageDir = join(dir, "zones") + "/";
 
-    packageData.dir = p2;
+    packageData.dir = zonesPackageDir;
     packageData.properties = {
       name: `named-zones-${name}`,
       description: `zone definitions for ${names}`,
@@ -284,7 +284,7 @@ export class BINDService extends ExtraSourceService {
 
     packageData.sources = [
       new FileContentProvider(
-        p2,
+        zonesPackageDir,
         {
           mode: 0o644,
           owner: "named",
@@ -300,34 +300,44 @@ export class BINDService extends ExtraSourceService {
 
     await this.generateZoneDefs(sources, packageData);
 
-    yield packageData;
-  }
+    const foreignZonesPackageDir = join(dir, "foreignZones") + "/";
 
-  async generateZoneDefs(sources, packageData) {
-    const nameService = this.findService({ type: "dns", priority: "<10" });
-    const rname = this.administratorEmail.replace(/@/, ".");
+    packageData.dir = foreignZonesPackageDir;
+    packageData.properties = {
+      name: `named-foreign-zones-${name}`,
+      description: `foreign zone definitions for ${names}`,
+      dependencies: [`named-zones-${name}`],
+      access: "private",
+      hooks: {}
+    };
 
-    const SOARecord = DNSRecord(
-      "@",
-      "SOA",
-      dnsFullName(nameService.domainName),
-      dnsFullName(rname),
-      `(${[...this.soaUpdates].join(" ")})`
-    );
+    packageData.sources = [
+      new FileContentProvider(
+        foreignZonesPackageDir,
+        {
+          mode: 0o644,
+          owner: "named",
+          group: "named"
+        },
+        {
+          mode: 0o755,
+          owner: "named",
+          group: "named"
+        }
+      )
+    ];
 
-    const NSRecord = DNSRecord(
-      "@",
-      "NS",
-      dnsFullName(nameService.ipAddressOrDomainName)
-    );
+    await this.generateForeignDefs(sources, packageData);
 
-    console.log(`${nameService}`, nameService.ipAddressOrDomainName);
+    yield packageData;
+  }
 
+  async generateForeignDefs(sources, packageData) {
     const configs = [];
 
     for (const source of sources) {
       for (const host of source.hosts()) {
-        configs.push(...this.foreignDomainZones(host, [SOARecord, NSRecord]));
+        configs.push(...this.foreignDomainZones(host, this.defaultRecords));
       }
     }
 
@@ -337,15 +347,18 @@ export class BINDService extends ExtraSourceService {
       addHook(
         packageData.properties.hooks,
         "post_upgrade",
-        /*        `rm -f ${foreignZones.map(
-          zone => `/var/lib/named/${zone.file}.jnl`
-        )}\n` + */
         `/usr/bin/named-hostname-info ${foreignZones
           .map(zone => zone.id)
           .join(" ")}|/usr/bin/named-hostname-update`
       );
     }
 
+    await this.writeZones(packageData, configs);
+  }
+
+  async generateZoneDefs(sources, packageData) {
+    const configs = [];
+
     for (const source of sources) {
       console.log(
         "LOCAL DOMAINS",
@@ -369,7 +382,7 @@ export class BINDService extends ExtraSourceService {
         const zone = {
           id: domain,
           file: `${locationName}/${domain}.zone`,
-          records: new Set([SOARecord, NSRecord, locationRecord])
+          records: new Set([...this.defaultRecords, locationRecord])
         };
         config.zones.push(zone);
 
@@ -384,8 +397,7 @@ export class BINDService extends ExtraSourceService {
             id: `catalog.${domain}`,
             file: `${locationName}/catalog.${domain}.zone`,
             records: new Set([
-              SOARecord,
-              NSRecord,
+              ...this.defaultRecords,
               DNSRecord(dnsFullName(`version.catalog.${domain}`), "TXT", '"1"')
             ])
           };
@@ -432,7 +444,7 @@ export class BINDService extends ExtraSourceService {
                       id,
                       type: "plain",
                       file: `${locationName}/${id}.zone`,
-                      records: new Set([SOARecord, NSRecord])
+                      records: new Set(this.defaultRecords)
                     };
                     config.zones.push(reverseZone);
                     reverseZones.set(subnet.address, reverseZone);
@@ -511,6 +523,27 @@ export class BINDService extends ExtraSourceService {
     });
   }
 
+  get defaultRecords() {
+    const nameService = this.findService({ type: "dns", priority: "<10" });
+    const rname = this.administratorEmail.replace(/@/, ".");
+
+    const SOARecord = DNSRecord(
+      "@",
+      "SOA",
+      dnsFullName(nameService.domainName),
+      dnsFullName(rname),
+      `(${[...this.soaUpdates].join(" ")})`
+    );
+
+    const NSRecord = DNSRecord(
+      "@",
+      "NS",
+      dnsFullName(nameService.ipAddressOrDomainName)
+    );
+
+    return [SOARecord, NSRecord];
+  }
+
   async writeZones(packageData, configs) {
     for (const config of configs) {
       console.log(`config: ${config.name}`);

package/types/services/bind.d.mts

@@ -392,8 +392,15 @@ export class BINDService extends ExtraSourceService {
             access: string;
         };
     }, void, unknown>;
+    generateForeignDefs(sources: any, packageData: any): Promise<void>;
     generateZoneDefs(sources: any, packageData: any): Promise<void>;
     foreignDomainZones(host: any, records: any): any;
+    get defaultRecords(): {
+        type: any;
+        key: any;
+        values: any[];
+        toString: (maxKeyLength?: number, ttl?: string) => string;
+    }[];
     writeZones(packageData: any, configs: any): Promise<void>;
 }
 import { ExtraSourceService } from "pmcf";