pmcf 4.11.1 → 4.12.1

package/package.json

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

package/src/dns-utils.mjs

@@ -20,9 +20,14 @@ export function sortZoneRecords(a, b) {
     return order;
   }
 
-  if (a.type === "PTR") {
-    const toNum = a => {
-      const s = a.split(".");
+  if (
+    a.type === "PTR" &&
+    b.type === "PTR" &&
+    a.key.indexOf(".arpa") > 0 &&
+    b.key.indexOf(".arpa") > 0
+  ) {
+    const toNum = key => {
+      const s = key.split(".");
       s.pop();
       s.pop();
       s.pop();

package/src/services/bind.mjs

@@ -308,34 +308,37 @@ export class BindService extends ExtraSourceService {
       name: `named-zones-${name}`,
       description: `zone definitions for ${names}`,
       dependencies: ["mf-named"],
-      access: "private",
-      hooks: {}
+      access: "private"
     };
 
     yield this.generateZoneDefs(sources, packageData);
 
-    const outfacingZonesPackageDir = join(dir, "outfacingZones") + "/";
+    const location = "outfacing";
+
+    const outfacingZonesPackageDir = join(dir, location) + "/";
 
     packageData.dir = outfacingZonesPackageDir;
     packageData.sources = [
       new FileContentProvider(outfacingZonesPackageDir, ...filePermissions)
     ];
     packageData.properties = {
-      name: `named-zones-${name}-outfacing`,
-      description: `outfacing zone definitions for ${names}`,
+      name: `named-zones-${name}-${location}`,
+      description: `${location} zone definitions for ${names}`,
       access: "private"
     };
 
-    yield* this.generateOutfacingDefs(sources, packageData);
+    yield* this.generateOutfacingDefs(sources, packageData, location);
   }
 
-  async *generateOutfacingDefs(sources, packageData) {
+  async *generateOutfacingDefs(sources, packageData, location) {
     const configs = [];
 
+    const view = this.views.internal;
+
     for (const source of sources) {
       for (const host of source.hosts()) {
         configs.push(
-          ...this.outfacingZones(host, this.views.internal, this.defaultRecords)
+          ...this.outfacingZones(host, view, this.defaultRecords)
         );
       }
     }
@@ -343,6 +346,12 @@ export class BindService extends ExtraSourceService {
     const outfacingZones = configs.map(c => c.zones).flat();
 
     if (outfacingZones.length) {
+      if (this.hasCatalog) {
+        const { catalogZone, config } = this.createCatalogZone(location, view, location);
+        configs.push(config);
+        outfacingZones.forEach(zone=>zone.catalogZone=catalogZone);
+      }
+
       addHook(
         packageData,
         "post_upgrade",
@@ -357,9 +366,33 @@ export class BindService extends ExtraSourceService {
     }
   }
 
+  createCatalogZone(name, view, directory) {
+    const config = {
+      view,
+      name: `catalog.${name}.zone.conf`,
+      type: "master",
+      zones: []
+    };
+
+    const catalogZone = {
+      catalog: true,
+      id: `catalog.${name}`,
+      file: `${directory}/catalog.${name}.zone`,
+      records: new Set([
+        ...this.defaultRecords,
+        DNSRecord(dnsFullName(`version.catalog.${name}`), "TXT", '"1"')
+      ])
+    };
+    config.zones.push(catalogZone);
+
+    return { config, catalogZone };
+  }
+
   async generateZoneDefs(sources, packageData) {
     const configs = [];
 
+    const view = this.views.internal;
+
     for (const source of sources) {
       console.log(
         "ZONE",
@@ -372,7 +405,7 @@ export class BindService extends ExtraSourceService {
         const reverseZones = new Map();
 
         const config = {
-          view: this.views.internal,
+          view,
           name: `${domain}.zone.conf`,
           type: "master",
           zones: []
@@ -392,24 +425,9 @@ export class BindService extends ExtraSourceService {
         config.zones.push(zone);
 
         if (this.hasCatalog) {
-          const catalogConfig = {
-            view: this.views.internal,
-            name: `catalog.${domain}.zone.conf`,
-            type: "master",
-            zones: []
-          };
-          configs.push(catalogConfig);
-
-          zone.catalogZone = {
-            catalog: true,
-            id: `catalog.${domain}`,
-            file: `${locationName}/catalog.${domain}.zone`,
-            records: new Set([
-              ...this.defaultRecords,
-              DNSRecord(dnsFullName(`version.catalog.${domain}`), "TXT", '"1"')
-            ])
-          };
-          catalogConfig.zones.push(zone.catalogZone);
+          const { catalogZone, config } = this.createCatalogZone(domain, view, locationName);
+          configs.push(config);
+          zone.catalogZone = catalogZone;
         }
 
         const hosts = new Set();
@@ -457,7 +475,6 @@ export class BindService extends ExtraSourceService {
 
               for (const domainName of domainNames) {
                 if (domainName.endsWith(zone.id) && domainName[0] !== "*") {
-                  
                   zone.records.add(
                     DNSRecord(
                       dnsFullName(domainName),

package/src/services/mosquitto.mjs

@@ -9,14 +9,6 @@ const MosquittoServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   key: "name",
   attributes: {
-    /*log_timestamp: {
-      ...boolean_attribute_writable_true,
-      configurable: true
-    },
-    allow_anonymous: {
-      ...boolean_attribute_writable_true,
-      configurable: true
-    },*/
     listener: {
       ...port_attribute,
       writable: true,

package/types/services/bind.d.mts

@@ -1479,7 +1479,26 @@ export class BindService extends ExtraSourceService {
     set excludeInterfaceKinds(value: Set<any>);
     get excludeInterfaceKinds(): Set<any>;
     preparePackages(dir: any): AsyncGenerator<any, void, unknown>;
-    generateOutfacingDefs(sources: any, packageData: any): AsyncGenerator<any, void, unknown>;
+    generateOutfacingDefs(sources: any, packageData: any, location: any): AsyncGenerator<any, void, unknown>;
+    createCatalogZone(name: any, view: any, directory: any): {
+        config: {
+            view: any;
+            name: string;
+            type: string;
+            zones: any[];
+        };
+        catalogZone: {
+            catalog: boolean;
+            id: string;
+            file: string;
+            records: Set<{
+                type: any;
+                key: any;
+                values: any[];
+                toString: (maxKeyLength?: number, ttl?: string) => string;
+            }>;
+        };
+    };
     generateZoneDefs(sources: any, packageData: any): Promise<any>;
     outfacingZones(host: any, view: any, records: any): any;
     get defaultRecords(): {