pmcf 1.91.2 → 1.93.0

package/package.json

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

package/src/address.mjs

@@ -0,0 +1,32 @@
+import { Base } from "./base.mjs";
+import { addType } from "./types.mjs";
+
+const AddressTypeDefinition = {
+  name: "address",
+  owners: ["location", "owner", "network", "root"],
+  priority: 0.6,
+  constructWithIdentifierOnly: true,
+  properties: {
+    address: {
+      type: "string",
+      collection: false,
+      writeable: false,
+      identifier: true
+    },
+  }
+};
+
+
+export class Address extends Base {
+  static {
+    addType(this);
+  }
+
+  static get typeDefinition() {
+    return AddressTypeDefinition;
+  }
+
+  constructor(owner, address) {
+    super(owner, address);
+  }
+}

package/src/cluster.mjs

@@ -186,7 +186,7 @@ export class Cluster extends Host {
         `${this.name}-master.target`,
         [
           "[Unit]",
-          `Description=Target for master state of cluster ${this.name}`,
+          `Description=master state of cluster ${this.name}`,
           "PartOf=keepalived.service",
           `Conflicts=${this.name}-fault.target`
         ]
@@ -197,7 +197,7 @@ export class Cluster extends Host {
         `${this.name}-backup.target`,
         [
           "[Unit]",
-          `Description=Target for backup state of cluster ${this.name}`,
+          `Description=backup state of cluster ${this.name}`,
           "PartOf=keepalived.service",
           `Conflicts=${this.name}-fault.target`
         ]
@@ -208,7 +208,7 @@ export class Cluster extends Host {
         `${this.name}-fault.target`,
         [
           "[Unit]",
-          `Description=Target for fault state of cluster ${this.name}`,
+          `Description=fault state of cluster ${this.name}`,
           `Conflicts=${this.name}-master.target ${this.name}-backup.target`
         ]
       );

package/src/dns.mjs

@@ -288,10 +288,12 @@ async function generateZoneDefs(dns, packageData) {
     };
     configs.push(config);
 
+    const locationRecord = DNSRecord("location", "TXT", dns.location.name)
+
     const zone = {
       id: domain,
       file: `${ownerName}/${domain}.zone`,
-      records: new Set([SOARecord, NSRecord])
+      records: new Set([SOARecord, NSRecord, locationRecord])
     };
     config.zones.push(zone);
 
@@ -368,6 +370,13 @@ async function generateZoneDefs(dns, packageData) {
 
         if (!hosts.has(host)) {
           hosts.add(host);
+
+          for (const foreignDomainName of host.foreignDomainNames) {
+            zone.records.add(
+              DNSRecord("external", "PTR", dnsFullName(foreignDomainName))
+            );
+          }
+
           for (const service of host.findServices()) {
             for (const record of service.dnsRecordsForDomainName(
               domainName,

package/src/host.mjs

@@ -361,9 +361,10 @@ export class Host extends Base {
 
   *networkAddresses() {
     for (const networkInterface of this.networkInterfaces.values()) {
-      for (const [address, subnet] of networkInterface.ipAddresses) {
+      for (const [address, subnet, domainName] of networkInterface.ipAddresses) {
         yield {
           networkInterface,
+          domainName,
           address,
           subnet
         };
@@ -437,6 +438,7 @@ const NetworkInterfaceTypeDefinition = {
   properties: {
     ...networkProperties,
     ...networkAddressProperties,
+    hostName: { type: "string", collection: false, writeable: true },
     ipAddresses: { type: "string", collection: true, writeable: true },
 
     hwaddr: { type: "string", collection: false, writeable: true },
@@ -464,6 +466,7 @@ export class NetworkInterface extends Base {
   #kind;
   arpbridge;
   hwaddr;
+  hostName;
 
   constructor(owner, data) {
     super(owner, data);
@@ -542,6 +545,11 @@ export class NetworkInterface extends Base {
     }
   }
 
+  get domainName()
+  {
+    return this.hostName ? [this.hostName,this.host.domain].join('.') : this.host.dmainName;
+  }
+
   get host() {
     return this.owner;
   }

package/src/module.mjs

@@ -6,6 +6,7 @@ export * from "./cluster.mjs";
 export * from "./owner.mjs";
 export * from "./location.mjs";
 export * from "./root.mjs";
+export * from "./address.mjs";
 export * from "./subnet.mjs";
 export * from "./network.mjs";
 export * from "./host.mjs";

package/types/address.d.mts

@@ -0,0 +1,17 @@
+export class Address extends Base {
+    static get typeDefinition(): {
+        name: string;
+        owners: string[];
+        priority: number;
+        constructWithIdentifierOnly: boolean;
+        properties: {
+            address: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+                identifier: boolean;
+            };
+        };
+    };
+}
+import { Base } from "./base.mjs";

package/types/host.d.mts

@@ -209,6 +209,7 @@ export class Host extends Base {
     get networkInterfaces(): Map<any, any>;
     networkAddresses(): Generator<{
         networkInterface: any;
+        domainName: any;
         address: any;
         subnet: any;
     }, void, unknown>;
@@ -282,6 +283,11 @@ export class NetworkInterface extends Base {
             };
         };
         properties: {
+            hostName: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
             ipAddresses: {
                 type: string;
                 collection: boolean;
@@ -366,6 +372,7 @@ export class NetworkInterface extends Base {
     };
     arpbridge: any;
     hwaddr: any;
+    hostName: any;
     addSubnet(address: any): any;
     set ipAddresses(value: Map<any, any>);
     get ipAddresses(): Map<any, any>;
@@ -378,6 +385,7 @@ export class NetworkInterface extends Base {
     subnetForAddress(address: any): any;
     get gateway(): any;
     get gatewayAddress(): any;
+    get domainName(): any;
     get network_interface(): this;
     set network(network: any);
     get network(): any;

package/types/module.d.mts

@@ -6,6 +6,7 @@ export * from "./cluster.mjs";
 export * from "./owner.mjs";
 export * from "./location.mjs";
 export * from "./root.mjs";
+export * from "./address.mjs";
 export * from "./subnet.mjs";
 export * from "./network.mjs";
 export * from "./host.mjs";