pmcf 2.71.9 → 2.71.11

package/package.json

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

package/src/services/chrony.mjs

@@ -1,7 +1,11 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import { addType } from "../types.mjs";
-import { ServiceTypeDefinition, serviceEndpoints } from "../service.mjs";
+import {
+  Service,
+  ServiceTypeDefinition,
+  serviceEndpoints
+} from "../service.mjs";
 import {
   ExtraSourceService,
   ExtraSourceServiceTypeDefinition
@@ -53,6 +57,9 @@ export class ChronyService extends ExtraSourceService {
 
   constructor(owner, data) {
     super(owner, data);
+
+    this._extends.push(new Service(owner, { name: this.name, type: "ntp" }));
+
     this.read(data, ChronyServiceTypeDefinition);
 
     this._systemd = "chronyd.service";
@@ -88,12 +95,12 @@ export class ChronyService extends ExtraSourceService {
           priority: ">=200"
         },
         endpoints: e =>
-          e.service.host !== host && e.networkInterface.kind !== "loopback",
+          e.type === "ntp" &&
+          e.service.host !== host &&
+          e.networkInterface?.kind !== "loopback",
 
         select: endpoint =>
-          `${endpoint.isPool ? "pool" : "server"} ${
-            endpoint.domainName
-          } iburst`,
+          `${endpoint.isPool ? "pool" : "server"} ${endpoint.address} iburst`,
 
         limit: 7
       }),

package/src/services/openldap.mjs

@@ -3,6 +3,7 @@ import { FileContentProvider } from "npm-pkgbuild";
 import { addType } from "../types.mjs";
 import { ServiceTypeDefinition, Service } from "../service.mjs";
 import { writeLines } from "../utils.mjs";
+import { addHook } from "../hooks.mjs";
 
 const OpenLDAPServiceTypeDefinition = {
   name: "openldap",
@@ -30,7 +31,7 @@ const OpenLDAPServiceTypeDefinition = {
   service: {
     extends: ["ldap"],
     services: {
-      "ldap": {
+      ldap: {
         endpoints: [
           {
             family: "unix",
@@ -117,10 +118,23 @@ export class OpenLDAPService extends Service {
         name: `openldap-${this.location.name}-${name}`,
         description: `openldap definitions for ${this.fullName}@${name}`,
         access: "private",
-        dependencies: ["openldap>=2.6.10"]
+        dependencies: ["openldap>=2.6.10"],
+        hooks: {}
       }
     };
 
+    addHook(
+      packageData.properties.hooks,
+      "post_upgrade",
+      "setfacl -m u:ldap:r /etc/letsencrypt/archive/*/privkey*.pem"
+    );
+
+    addHook(
+      packageData.properties.hooks,
+      "post_install",
+      "setfacl -m u:ldap:r /etc/letsencrypt/archive/*/privkey*.pem"
+    );
+
     await writeLines(join(packageData.dir, "etc/conf.d"), "slapd", [
       "SLAPD_OPTIONS=",
       "SLAPD_URLS=ldap:/// ldaps:/// ldapi://%2Frun%2Fldapi"

package/src/services/systemd-timesyncd.mjs

@@ -38,23 +38,24 @@ export class SystemdTimesyncdService extends ExtraSourceService {
   }
 
   systemdConfigs(name) {
+    const options = priority => {
+      return {
+        services: { types: "ntp", priority },
+        endpoints: e => e.networkInterface?.kind !== "loopback",
+        select: endpoint => endpoint.address,
+        join: " ",
+        limit: 2
+      };
+    };
+
     return {
       serviceName: "systemd-timesyncd.service",
       configFileName: `etc/systemd/timesyncd.conf.d/${name}.conf`,
       content: [
         "Time",
         {
-          NTP: serviceEndpoints(this, {
-            services: {
-              types: "ntp",
-              priority: "[200:399]"
-            },
-            endpoints: endpoint =>
-              endpoint.networkInterface.kind !== "loopback",
-            select: endpoint => endpoint.domainName,
-            limit: 2,
-            join: " "
-          })
+          NTP: serviceEndpoints(this, options("[300:399]")),
+          FallbackNTP: serviceEndpoints(this, options("[100:199]"))
         }
       ]
     };

package/types/services/openldap.d.mts

@@ -300,6 +300,7 @@ export class OpenLDAPService extends Service {
             description: string;
             access: string;
             dependencies: string[];
+            hooks: {};
         };
     }, void, unknown>;
 }

package/types/services/systemd-timesyncd.d.mts

@@ -260,6 +260,7 @@ export class SystemdTimesyncdService extends ExtraSourceService {
         configFileName: string;
         content: (string | {
             NTP: any;
+            FallbackNTP: any;
         })[];
     };
 }