pmcf 1.87.3 → 1.88.0

package/package.json

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

package/src/cluster.mjs

@@ -110,6 +110,12 @@ export class Cluster extends Host {
         cfg.push("    auth_type PASS");
         cfg.push("    auth_pass pass1234");
         cfg.push("  }");
+
+
+        cfg.push(`  notify_master "/usr/bin/systemctl start ${host.name}-master.target"`);
+        cfg.push(`  notify_backup "/usr/bin/systemctl start ${host.name}-backup.target"`);
+        cfg.push(`  notify_fault "/usr/bin/systemctl start ${host.name}-fault.target"`);
+
         cfg.push("}");
         cfg.push("");
 
@@ -150,6 +156,33 @@ export class Cluster extends Host {
         cfg
       );
 
+      await writeLines(
+        join(packageStagingDir, "/usr/lib/systemd/system"),
+        `${this.name}-master.target`,
+        [
+          "[Unit]",
+          `Description: Services to be activated in master state of cluster ${this.name}`
+        ]
+      );
+
+      await writeLines(
+        join(packageStagingDir, "/usr/lib/systemd/system"),
+        `${this.name}-backup.target`,
+        [
+          "[Unit]",
+          `Description: Services to be activated in backup state of cluster ${this.name}`
+        ]
+      );
+
+      await writeLines(
+        join(packageStagingDir, "/usr/lib/systemd/system"),
+        `${this.name}-fault.target`,
+        [
+          "[Unit]",
+          `Description: Services to be activated in fault state of cluster ${this.name}`
+        ]
+      );
+
       yield result;
     }
   }

package/src/dns.mjs

@@ -41,6 +41,22 @@ const DNSServiceTypeDefinition = {
 
 const DNS_SERVICE_FILTER = { type: DNSServiceTypeDefinition.name };
 
+function addressList(objects) {
+  return Array.from(objects).map(object =>
+    typeof object === "string" ? object : object.name
+  );
+}
+
+function addressesStatement(prefix, objects, generateEmpty = false) {
+  const body = addressList(objects).map(name => `  ${name};`);
+
+  if (body.length || generateEmpty) {
+    return [`${prefix} {`, body, "};"];
+  }
+
+  return [];
+}
+
 export class DNSService extends Base {
   allowedUpdates = [];
   recordTTL = "1W";
@@ -146,11 +162,10 @@ export class DNSService extends Base {
       }
     };
 
-    const options = [
-      "forwarders {",
-      ...serviceAddresses(this.source, DNS_SERVICE_FILTER).map(a => `  ${a};`),
-      "};"
-    ];
+    const options = addressesStatement(
+      "forwarders",
+      serviceAddresses(this.source, DNS_SERVICE_FILTER)
+    );
     if (options.length > 2) {
       await writeLines(
         join(p1, "etc/named/options"),
@@ -160,22 +175,15 @@ export class DNSService extends Base {
     }
 
     const acls = [
-      "acl trusted {",
-      ...Array.from(subnets(this.trusted)).map(subnet => `  ${subnet.name};`),
-      "};",
-      "",
-      "acl protected {",
-      ...Array.from(subnets(this.protected)).map(subnet => `  ${subnet.name};`),
-      "};",
-      "",
-      "acl open {",
-      "};"
-    ];
+      addressesStatement("acl trusted", subnets(this.trusted)),
+      addressesStatement("acl protected", subnets(this.protected)),
+      addressesStatement("acl open", [], true)
+    ].flat();
 
-    if (options.length > 8) {
+    if (acls.length) {
       await writeLines(join(p1, "etc/named"), `0-acl-${name}.conf`, acls);
     }
-    if (options.length > 2 || acls.length > 8) {
+    if (options.length || acls.length) {
       yield packageData;
     }
 

package/src/service.mjs

@@ -54,7 +54,8 @@ const ServiceTypeDefinition = {
     priority: { type: "number", collection: false, writeable: true },
     weight: { type: "number", collection: false, writeable: true },
     srvPrefix: { type: "string", collection: false, writeable: false },
-    tls: { type: "string", collection: false, writeable: false }
+    tls: { type: "string", collection: false, writeable: false },
+    systemd: { type: "string", collection: true, writeable: true }
   }
 };
 
@@ -65,6 +66,7 @@ export class Service extends Base {
   #type;
   #port;
   #ipAddresses;
+  #systemd;
 
   static {
     addType(this);
@@ -98,6 +100,10 @@ export class Service extends Base {
         data.ipAddresses = this.#ipAddresses;
       }
 
+      if (this.#systemd) {
+        data.systemd = this.#systemd;
+      }
+
       // @ts-ignore
       return new this.constructor(owner, data);
     }
@@ -191,6 +197,11 @@ export class Service extends Base {
     return ServiceTypes[this.type]?.tls || false;
   }
 
+  get systemdServices()
+  {
+    return this.#systemd;
+  }
+
   get srvPrefix() {
     const st = ServiceTypes[this.type];
     if (st?.protocol) {

package/types/service.d.mts

@@ -97,6 +97,11 @@ export class Service extends Base {
                 collection: boolean;
                 writeable: boolean;
             };
+            systemd: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
             cidrAddresses: {
                 type: string;
                 collection: boolean;
@@ -138,6 +143,7 @@ export class Service extends Base {
     get master(): any;
     get protocol(): any;
     get tls(): any;
+    get systemdServices(): any;
     get srvPrefix(): string;
     dnsRecordsForDomainName(domainName: any, hasSVRRecords: any): {
         key: any;