pmcf 2.71.8 → 2.71.10

package/package.json

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

package/src/service.mjs

@@ -167,16 +167,15 @@ export class Service extends Base {
             } else {
               if (e.family === na.family) {
                 result.push(new Endpoint(this, na, options));
-              } else {
-                if (!domainNames.has(this.domainName)) {
-                  domainNames.add(this.domainName);
-                  result.push(
-                    new DomainNameEndpoint(this, this.domainName, options)
-                  );
-                }
               }
             }
           }
+
+          if (!domainNames.has(this.domainName)) {
+            domainNames.add(this.domainName);
+            result.push(new DomainNameEndpoint(this, this.domainName, options));
+          }
+
           break;
       }
     }

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/types/services/openldap.d.mts

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