pmcf 6.68.14 → 6.69.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.68.14",
+  "version": "6.69.0",
   "publishConfig": {
     "access": "public"
   },
@@ -54,8 +54,8 @@
     "content-entry-transform": "^1.7.11",
     "filtered-map": "^1.0.0",
     "ip-utilties": "^3.13.1",
-    "npm-pkgbuild": "^22.2.18",
-    "pacc": "^14.3.0",
+    "npm-pkgbuild": "^22.2.19",
+    "pacc": "^14.4.0",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.1"
   },

package/src/owner.mjs

@@ -5,7 +5,7 @@ import { FilteredMap } from "filtered-map";
 import {
   string_set_attribute_writable,
   string_attribute_writable,
-  email_attribute,
+  email_attribute_writable,
   asArray
 } from "pacc";
 import { union } from "./utils.mjs";
@@ -54,9 +54,8 @@ export class owner extends ServiceOwner {
       description: "unix locale"
     },
     administratorEmail: {
-      ...email_attribute,
-      name: "administratorEmail",
-      writable: true
+      ...email_attribute_writable,
+      name: "administratorEmail"
     }
   };
 

package/src/services/chrony.mjs

@@ -1,5 +1,5 @@
 import { join } from "node:path";
-import { default_collection_attribute_writable, asArray } from "pacc";
+import { default_collection_attribute_writable, leafValues, asArray } from "pacc";
 import { addType, CoreService } from "pmcf";
 import { writeLines } from "../utils.mjs";
 import { FAMILY_UNIX, FAMILY_IPV4_IPV6, PROTOCOL_TCP } from "../constants.mjs";
@@ -41,7 +41,7 @@ export class chrony extends CoreService {
 
   async *preparePackages(dir) {
     const packageData = await this.preparePackage(dir);
-    const subnets = [...new Map(this.subnets).values()]; // TODO should be normal
+    const addresses = [...new Set(leafValues(this.subnets).map(s=>s.address))];
     const host = this.host;
 
     function chronyServer(endpoint) {
@@ -74,9 +74,9 @@ export class chrony extends CoreService {
       "ntsdumpdir /var/lib/chrony",
       "dumpdir /var/lib/chrony",
       "pidfile /run/chrony/chronyd.pid",
-      subnets.map(s => `allow ${s.address}`),
+      addresses.map(address => `allow ${address}`),
       "cmdratelimit interval -4 burst 16",
-      subnets.map(s => `cmdallow ${s.address}`)
+      addresses.map(address => `cmdallow ${address}`)
     ];
 
     await writeLines(join(dir, "etc"), "chrony.conf", lines);

package/src/services/keepalived.mjs

@@ -3,7 +3,8 @@ import {
   default_attribute_writable,
   default_collection_attribute_writable,
   enum_string_attribute_writable,
-  priority_attribute_writable
+  priority_attribute_writable,
+  email_attribute_writable
 } from "pacc";
 import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
 import { addType } from "../type.mjs";
@@ -73,6 +74,8 @@ export class keepalive_cluster_member extends core {
 
 const states = ["master", "backup", "fault"];
 
+const SCOPE_KEEPALIVED = "keepalived";
+
 export class keepalived extends CoreService {
   static priority = 1.5;
   static attributes = {
@@ -80,6 +83,12 @@ export class keepalived extends CoreService {
       ...default_collection_attribute_writable,
       type: keepalive_cluster_member,
       name: "clusters"
+    },
+    notification_email_from: {
+      ...email_attribute_writable,
+      name: "notification_email_from",
+      default: "keepalived",
+      scope: SCOPE_KEEPALIVED
     }
   };
 
@@ -106,7 +115,7 @@ export class keepalived extends CoreService {
       "    " + this.administratorEmail,
       "  }",
       ...extra,
-      `  notification_email_from keepalived@${this.domainName}`,
+      `  notification_email_from ${this.notification_email_from}`,
       "  enable_script_security",
       "  script_user root",
       "  max_auto_priority 20",