pmcf 6.22.4 → 6.22.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/cluster.mjs +4 -5
- package/src/services/bind.mjs +1 -1
package/package.json
CHANGED
package/src/cluster.mjs
CHANGED
|
@@ -50,7 +50,7 @@ export class Cluster extends Host {
|
|
|
50
50
|
}
|
|
51
51
|
|
|
52
52
|
async *preparePackages(stagingDir) {
|
|
53
|
-
for (const ni of [...this.owner.clusters].reduce(
|
|
53
|
+
for (const ni of [...this.owner.clusters.values()].reduce(
|
|
54
54
|
(all, cluster) => all.union(cluster.members),
|
|
55
55
|
new Set()
|
|
56
56
|
)) {
|
|
@@ -69,6 +69,7 @@ export class Cluster extends Host {
|
|
|
69
69
|
const extra = [];
|
|
70
70
|
|
|
71
71
|
const smtp = this.smtp;
|
|
72
|
+
|
|
72
73
|
if (smtp) {
|
|
73
74
|
extra.push(` smtp_server ${smtp.address()}`);
|
|
74
75
|
}
|
|
@@ -88,7 +89,7 @@ export class Cluster extends Host {
|
|
|
88
89
|
];
|
|
89
90
|
|
|
90
91
|
const credentials = [];
|
|
91
|
-
for (const cluster of [...this.owner.clusters].sort((a, b) =>
|
|
92
|
+
for (const cluster of [...this.owner.clusters.values()].sort((a, b) =>
|
|
92
93
|
a.name.localeCompare(b.name)
|
|
93
94
|
)) {
|
|
94
95
|
const name = cluster.name;
|
|
@@ -108,9 +109,7 @@ export class Cluster extends Host {
|
|
|
108
109
|
: "virtual_ipaddress_excluded"
|
|
109
110
|
} {`
|
|
110
111
|
);
|
|
111
|
-
cfg.push(
|
|
112
|
-
` ${na.cidrAddress} dev ${ni.name} label ${name}`
|
|
113
|
-
);
|
|
112
|
+
cfg.push(` ${na.cidrAddress} dev ${ni.name} label ${name}`);
|
|
114
113
|
cfg.push(" }");
|
|
115
114
|
}
|
|
116
115
|
|
package/src/services/bind.mjs
CHANGED
|
@@ -85,7 +85,7 @@ class bind_zone extends Base {
|
|
|
85
85
|
this.directory = location;
|
|
86
86
|
this.records = new Set(owner.defaultRecords);
|
|
87
87
|
|
|
88
|
-
if (owner.hasLocationRecord) {
|
|
88
|
+
if (!this.isCatalog && owner.hasLocationRecord) {
|
|
89
89
|
this.records.add(DNSRecord("location", "TXT", location));
|
|
90
90
|
}
|
|
91
91
|
|