pmcf 4.8.1 → 4.8.3

package/README.md

@@ -42,69 +42,84 @@ generates config packages for:
 
 *   [Base](#base)
     *   [Parameters](#parameters)
-    *   [propertyIterator](#propertyiterator)
+    *   [extendedAttribute](#extendedattribute)
         *   [Parameters](#parameters-1)
-    *   [getProperties](#getproperties)
+    *   [propertyIterator](#propertyiterator)
         *   [Parameters](#parameters-2)
+    *   [getProperties](#getproperties)
+        *   [Parameters](#parameters-3)
     *   [priority](#priority)
     *   [expression](#expression)
-        *   [Parameters](#parameters-3)
-    *   [findService](#findservice)
         *   [Parameters](#parameters-4)
-    *   [expand](#expand)
+    *   [findService](#findservice)
         *   [Parameters](#parameters-5)
+    *   [property](#property)
+        *   [Parameters](#parameters-6)
+    *   [expand](#expand)
+        *   [Parameters](#parameters-7)
 *   [PortEndpoint](#portendpoint)
-    *   [Parameters](#parameters-6)
+    *   [Parameters](#parameters-8)
     *   [port](#port)
     *   [socketAddress](#socketaddress)
 *   [HTTPEndpoint](#httpendpoint)
-    *   [Parameters](#parameters-7)
+    *   [Parameters](#parameters-9)
     *   [port](#port-1)
 *   [SkeletonNetworkInterface](#skeletonnetworkinterface)
     *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-8)
+        *   [Parameters](#parameters-10)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-9)
+        *   [Parameters](#parameters-11)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-10)
+        *   [Parameters](#parameters-12)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-11)
+    *   [Parameters](#parameters-13)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-12)
+    *   [Parameters](#parameters-14)
 *   [cidrAddresses](#cidraddresses)
-    *   [Parameters](#parameters-13)
+    *   [Parameters](#parameters-15)
 *   [isTemplate](#istemplate)
 *   [services](#services)
-    *   [Parameters](#parameters-14)
+    *   [Parameters](#parameters-16)
 *   [named](#named)
-    *   [Parameters](#parameters-15)
+    *   [Parameters](#parameters-17)
 *   [serviceEndpoints](#serviceendpoints)
-    *   [Parameters](#parameters-16)
+    *   [Parameters](#parameters-18)
 *   [domainName](#domainname)
-    *   [Parameters](#parameters-17)
+    *   [Parameters](#parameters-19)
 *   [domainFromDominName](#domainfromdominname)
-    *   [Parameters](#parameters-18)
+    *   [Parameters](#parameters-20)
 *   [sectionLines](#sectionlines)
-    *   [Parameters](#parameters-19)
+    *   [Parameters](#parameters-21)
 *   [asArray](#asarray)
-    *   [Parameters](#parameters-20)
+    *   [Parameters](#parameters-22)
 *   [asIterator](#asiterator)
-    *   [Parameters](#parameters-21)
+    *   [Parameters](#parameters-23)
 
 ## Base
 
+attributes: essential values
+properties: use defined values to support attribute value definitions
+
 ### Parameters
 
 *   `owner` **[Base](#base)** 
 *   `data` **[object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?** 
 
+### extendedAttribute
+
+#### Parameters
+
+*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+
+Returns **any** 
+
 ### propertyIterator
 
 Retrive attribute values from an object.
@@ -146,6 +161,14 @@ Returns **any** 
 
 Returns **any** service with the highest priority
 
+### property
+
+#### Parameters
+
+*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+
+Returns **any** 
+
 ### expand
 
 #### Parameters

package/package.json

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

package/src/base.mjs

@@ -605,7 +605,7 @@ export class Base {
     for (const node of this.walkDirections(["this", "extends", "owner"])) {
       const value = node._properties?.[name];
       if (value !== undefined) {
-        return value;
+        return this.expand(value);
       }
     }
   }

package/src/host.mjs

@@ -429,11 +429,11 @@ export class Host extends ServiceOwner {
       dir,
       sources: [
         new FileContentProvider(
-          { base: this.directory, pattern: "*.pub" },
+          { dir: this.directory, pattern: "*.pub" },
           { destination: "/etc/ssh/", mode: 0o644 }
         ),
         new FileContentProvider(
-          { base: this.directory, pattern: "*_key" },
+          { dir: this.directory, pattern: "*_key" },
           { destination: "/etc/ssh/", mode: 0o600 }
         ),
         new FileContentProvider(dir + "/")

package/src/location.mjs

@@ -44,7 +44,7 @@ export class Location extends Owner {
       sources: [
         new FileContentProvider(dir + "/"),
         new FileContentProvider(
-          { base: this.directory, pattern: "location.json" },
+          { dir: this.directory, pattern: "location.json" },
           { destination: "/etc/location/location.json" }
         )
       ],
@@ -54,8 +54,7 @@ export class Location extends Owner {
         description: `${this.typeName} definitions for ${this.fullName}`,
         access: "private",
         dependencies: { jq: ">=1.8" },
-        provides: ["location", "mf-location"],
-        replaces: [`mf-location-${this.name}`]
+        provides: ["location", "mf-location"]
       }
     };
 

package/src/services/openldap.mjs

@@ -7,7 +7,6 @@ import {
 } from "pacc";
 import { addServiceType } from "pmcf";
 import { ServiceTypeDefinition, Service } from "../service.mjs";
-import { addHook } from "../hooks.mjs";
 
 const OpenLDAPServiceTypeDefinition = {
   name: "openldap",
@@ -84,8 +83,6 @@ export class OpenLDAPService extends Service {
   }
 
   async *preparePackages(dir) {
-    const host = this.host;
-    const name = host.name;
     const owner = "ldap";
     const group = "ldap";
 
@@ -108,25 +105,13 @@ export class OpenLDAPService extends Service {
       ],
       outputs: this.outputs,
       properties: {
-        name: `${this.typeName}-${this.location.name}-${name}`,
-        description: `${this.typeName} definitions for ${this.fullName}@${name}`,
+        name: `${this.typeName}-${this.location.name}-${this.host.name}`,
+        description: `${this.typeName} definitions for ${this.fullName}@${this.host.name}`,
         access: "private",
         dependencies: ["openldap>=2.6.10"]
       }
     };
 
-    addHook(
-      packageData,
-      "post_upgrade",
-      `setfacl -m u:${owner}:r /etc/letsencrypt/archive/*/privkey*.pem`
-    );
-
-    addHook(
-      packageData,
-      "post_install",
-      `setfacl -m u:${owner}:r /etc/letsencrypt/archive/*/privkey*.pem`
-    );
-
     yield packageData;
   }
 }

package/types/location.d.mts

@@ -361,7 +361,6 @@ export class Location extends Owner {
                 jq: string;
             };
             provides: string[];
-            replaces: string[];
         };
     }, void, unknown>;
 }