pmcf 4.13.0 → 4.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.13.0",
+  "version": "4.14.0",
   "publishConfig": {
     "access": "public"
   },
@@ -56,7 +56,7 @@
     "content-entry-transform": "^1.6.1",
     "ip-utilties": "^2.0.3",
     "npm-pkgbuild": "^20.2.2",
-    "pacc": "^8.1.3",
+    "pacc": "^8.1.2",
     "package-directory": "^8.1.0"
   },
   "devDependencies": {

package/src/dns-utils.mjs

@@ -20,7 +20,8 @@ export function sortZoneRecords(a, b) {
     return order;
   }
 
-  const numSortable = (record) => record.type === "PTR" && record.key.indexOf(".arpa") > 0 && record.key.indexOf("zones") < 0;
+  const numSortable = record =>
+    record.type === "PTR" && record.key.indexOf(".arpa") > 0;
 
   if (numSortable(a) && numSortable(b)) {
     const toNum = key => {

package/src/services/bind.mjs

@@ -92,7 +92,12 @@ const BindServiceTypeDefinition = {
     retry: { ...string_attribute_writable, default: 72000 },
     expire: { ...string_attribute_writable, default: 600000 },
     minimum: { ...string_attribute_writable, default: 60000 },
-    allowedUpdates: string_collection_attribute_writable
+    allowedUpdates: string_collection_attribute_writable,
+    primaries: {
+      ...default_attribute_writable,
+      type: networkAddressType,
+      collection: true
+    }
   },
   service: {
     systemdService: "bind.service",
@@ -182,6 +187,11 @@ export class BindService extends ExtraSourceService {
     return BindServiceTypeDefinition.name;
   }
 
+  get serverType()
+  {
+    return this.primaries ? "secondary" : "primary";
+  }
+
   get soaUpdates() {
     return [this.serial, this.refresh, this.retry, this.expire, this.minimum];
   }
@@ -375,7 +385,7 @@ export class BindService extends ExtraSourceService {
         const config = {
           view,
           name: `${domain}.zone.conf`,
-          type: "master",
+          type: this.serverType,
           zones: []
         };
         outputControl.configs.push(config);
@@ -431,7 +441,6 @@ export class BindService extends ExtraSourceService {
                 reverseZone = {
                   id,
                   config,
-                  type: "plain",
                   file: `${locationName}/${id}.zone`,
                   records: new Set(this.defaultRecords)
                 };
@@ -518,7 +527,7 @@ export class BindService extends ExtraSourceService {
       const config = {
         view,
         name: `${domain}.zone.conf`,
-        type: "master",
+        type: this.serverType,
         zones: [zone]
       };
       zone.config = config;
@@ -565,14 +574,14 @@ export class BindService extends ExtraSourceService {
         file: `${directory}/catalog.${name}.zone`,
         records: new Set([
           ...this.defaultRecords,
-          DNSRecord(dnsFullName(`version.catalog.${name}`), "TXT", '"2"')
+          DNSRecord("version", "TXT", '"2"')
         ])
       };
       outputControl.catalogs.set(directory, catalogZone);
       const config = {
         view: zone.config.view,
         name: `catalog.${name}.zone.conf`,
-        type: "master",
+        type: this.serverType,
         zones: [catalogZone]
       };
       catalogZone.config = config;
@@ -582,7 +591,7 @@ export class BindService extends ExtraSourceService {
 
     const hash = createHmac("sha1", zone.id).digest("hex");
     catalogZone.records.add(
-        DNSRecord(`${hash}.zones.${zone.id}.`, "PTR", dnsFullName(zone.id))
+      DNSRecord(`${hash}.zones`, "PTR", dnsFullName(zone.id))
     );
 
     return catalogZone;

package/types/services/bind.d.mts

@@ -1421,6 +1421,27 @@ export class BindService extends ExtraSourceService {
                 additionalValues?: object;
             };
             allowedUpdates: import("pacc").AttributeDefinition;
+            primaries: {
+                type: string;
+                collection: boolean;
+                isKey: boolean;
+                writable: boolean;
+                mandatory: boolean;
+                private?: boolean;
+                credential?: boolean;
+                persistent?: boolean;
+                depends?: string;
+                description?: string;
+                default?: any;
+                set?: Function;
+                get?: Function;
+                toInternal?: Function;
+                toExternal?: Function;
+                values?: Set<any>;
+                externalName?: string;
+                env?: string[] | string;
+                additionalValues?: object;
+            };
         };
         service: {
             systemdService: string;
@@ -1465,6 +1486,7 @@ export class BindService extends ExtraSourceService {
     expire: number;
     minimum: number;
     views: {};
+    get serverType(): "secondary" | "primary";
     get soaUpdates(): number[];
     set zones(value: any[]);
     get zones(): any[];