pmcf 3.19.5 → 3.19.7

package/README.md

@@ -74,12 +74,16 @@ generates config packages for:
     *   [Parameters](#parameters-9)
 *   [serviceEndpoints](#serviceendpoints)
     *   [Parameters](#parameters-10)
-*   [sectionLines](#sectionlines)
+*   [domainName](#domainname)
     *   [Parameters](#parameters-11)
-*   [asArray](#asarray)
+*   [domainFromDominName](#domainfromdominname)
     *   [Parameters](#parameters-12)
-*   [asIterator](#asiterator)
+*   [sectionLines](#sectionlines)
     *   [Parameters](#parameters-13)
+*   [asArray](#asarray)
+    *   [Parameters](#parameters-14)
+*   [asIterator](#asiterator)
+    *   [Parameters](#parameters-15)
 
 ## Base
 
@@ -237,6 +241,28 @@ Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Gl
 
 Returns **([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String) | any)** 
 
+## domainName
+
+Appends default domain if name does not already have a domain.
+
+### Parameters
+
+*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+*   `defaultDomain` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** 
+
+Returns **([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String) | [undefined](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/undefined))** 
+
+## domainFromDominName
+
+Extracts domain name from a name.
+
+### Parameters
+
+*   `domainName` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+*   `defaultDomain` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** 
+
+Returns **([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String) | [undefined](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/undefined))** 
+
 ## sectionLines
 
 ### Parameters

package/package.json

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

package/src/host.mjs

@@ -498,7 +498,7 @@ export class Host extends ServiceOwner {
     for (const service of this.services) {
       if (service.systemdConfigs) {
         for (const { serviceName, configFileName, content } of asArray(
-          service.systemdConfigs(this.name)
+          service.expand(service.systemdConfigs(this.name))
         )) {
           await writeLines(dir, configFileName, sectionLines(...content));
 

package/src/service.mjs

@@ -89,6 +89,14 @@ export class Service extends Base {
     return ServiceTypeDefinition;
   }
 
+  get isTemplate() {
+    // TODO
+    if (this.fullName.startsWith("/services")) {
+      return true;
+    }
+    return super.isTemplate;
+  }
+
   toString() {
     return `${super.toString()}[${this.type}]`;
   }

package/src/services/openldap.mjs

@@ -123,25 +123,30 @@ export class OpenLDAPService extends Service {
       "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"
-    ]);
+    await writeLines(
+      join(packageData.dir, "etc/conf.d"),
+      "slapd",
+      this.expand([
+        "SLAPD_OPTIONS=",
+        "SLAPD_URLS=ldap:/// ldaps:/// ldapi://%2Frun%2Fldapi"
+      ])
+    );
 
     await writeLines(
       join(packageData.dir, "/var/lib/openldap/openldap-data"),
       "DB_CONFIG",
-      [
+      this.expand([
         "set_cachesize 0 16777216 1",
         "set_lg_regionmax 65536",
         "set_lg_bsize 524288"
-      ]
+      ])
     );
 
-    await writeLines(join(packageData.dir, "etc/openldap"), "ldap.conf", [
-      `BASE  ${this.baseDN}`,
-      `URI   ${this.uri}`
-    ]);
+    await writeLines(
+      join(packageData.dir, "etc/openldap"),
+      "ldap.conf",
+      this.expand([`BASE  ${this.baseDN}`, `URI   ${this.uri}`])
+    );
 
     yield packageData;
   }