pmcf 6.26.0 → 6.26.2

package/README.md

@@ -79,30 +79,30 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-14)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-15)
 *   [zones](#zones)
 *   [type](#type)
 *   [addressesStatement](#addressesstatement)
-    *   [Parameters](#parameters-16)
+    *   [Parameters](#parameters-15)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-17)
+        *   [Parameters](#parameters-16)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-18)
+        *   [Parameters](#parameters-17)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-19)
+    *   [Parameters](#parameters-18)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-20)
+    *   [Parameters](#parameters-19)
 *   [cidrAddresses](#cidraddresses)
-    *   [Parameters](#parameters-21)
+    *   [Parameters](#parameters-20)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-21)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
@@ -301,18 +301,6 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 *   `directory`   (optional, default `"/"`)
 
-## SkeletonNetworkInterface
-
-**Extends ServiceOwner**
-
-### networkAddresses
-
-#### Parameters
-
-*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
-
-Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
-
 ## zones
 
 Type: [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)\<bind\_zone>
@@ -409,6 +397,18 @@ Returns **Iterable<[string](https://developer.mozilla.org/docs/Web/JavaScript/Re
 
 Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
 
+## SkeletonNetworkInterface
+
+**Extends ServiceOwner**
+
+### networkAddresses
+
+#### Parameters
+
+*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
+
+Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
+
 ## families
 
 Returns **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;

package/package.json

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

package/src/base.mjs

@@ -17,7 +17,7 @@ import {
   filterPublic,
   extendingAttributeIterator,
   name_attribute_writable,
-  type_attribute,
+  type_attribute_writable,
   string_attribute_writable,
   string_set_attribute_writable,
   description_attribute_writable,
@@ -41,7 +41,7 @@ export class Base {
     name: name_attribute_writable,
     aliases: aliases_attribute,
     description: description_attribute_writable,
-    type: type_attribute,
+    type: type_attribute_writable,
     directory: { ...string_attribute_writable, name: "directory" },
     packaging: { ...string_set_attribute_writable, name: "packaging" },
     disabled: { ...boolean_attribute_writable, name: "disabled" },

package/src/cluster.mjs

@@ -150,11 +150,9 @@ export class Cluster extends Host {
           cfg.push(`  protocol ${endpoint.protocol.toUpperCase()}`);
 
           for (const member of this.members) {
-            const memberService = Array.from(
-              member.expression(`services[types[${endpoint.type}]][0]`)
-            );
+            const memberService = member.expression(`services[types[${endpoint.type}]][0]`); 
 
-            console.log(member.fullName, endpoint.type, memberService);
+            console.log(member.fullName, endpoint.type, memberService?.fullName);
             cfg.push(`  real_server ${member.address} ${memberService.port} {`);
             cfg.push(`    weight ${memberService.weight}`);
 

package/src/core-service.mjs

@@ -2,7 +2,7 @@ import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
 import {
   string_attribute_writable,
   number_attribute_writable,
-  string_set_attribute,
+  string_set_attribute_writable,
   boolean_attribute_false,
   port_attribute_writable,
   priority_attribute
@@ -43,7 +43,7 @@ export const endpointAttributes = {
     name: "protocol",
     values: new Set(["tcp", "udp", "quic"])
   },
-  types: { ...string_set_attribute, name: "types" },
+  types: { ...string_set_attribute_writable, name: "types" },
   tls: { ...boolean_attribute_false, name: "tls" }
 };
 

package/src/service-types.mjs

@@ -186,6 +186,13 @@ export const ServiceTypes = {
     ],
     dnsRecord: { type: "MX" }
   },
+  smtps: {
+    endpoints: [
+      { family: FAMILY_IPV4, protocol: "tcp", port: 465, tls: true },
+      { family: FAMILY_IPV6, protocol: "tcp", port: 465, tls: true }
+    ],
+    dnsRecord: { type: "MX" }
+  },
   submission: {
     endpoints: [
       { family: FAMILY_IPV4, protocol: "tcp", port: 587, tls: false },

package/src/service.mjs

@@ -1,4 +1,5 @@
 import { setBaseService, CoreService, addType } from "pmcf";
+import { serviceTypes, ServiceTypes } from "./service-types.mjs";
 
 export class Service extends CoreService {
   static name = "service";
@@ -8,6 +9,29 @@ export class Service extends CoreService {
   }
 
   _type;
+  _types;
+
+  set types(value) {
+    this._types = value;
+  }
+
+  get types() {
+    if (this._types) {
+      this._types.add(this.type);
+      return this._types;
+    }
+    if (this._type) {
+      return new Set([this._type]);
+    }
+
+    const types = serviceTypes(ServiceTypes[this.type]);
+
+    if(types.size) {
+      return types;
+    }
+
+    return new Set([this.name]);
+  }
 
   set type(value) {
     this._type = value;

package/src/services/bind.mjs

@@ -321,7 +321,7 @@ class bind_group extends Base {
   }
 
   get domains() {
-    return this.entries.reduce(
+    return this.entries?.reduce(
       (all, address) => all.union(address.domains),
       new Set()
     );

package/src/services/postfix.mjs

@@ -3,7 +3,9 @@ import { CoreService, addType } from "pmcf";
 export class postfix extends CoreService {
   static service = {
     systemdService: "postfix.service",
-    extends: ["smtp", "lmtp", "submission"]
+    systemUserName: "root",
+    systemGroupName: "root",
+    extends: ["smtp", "smtps", "lmtp", "submission"]
   };
 
   static {

package/src/services/systemd-journal-remote.mjs

@@ -73,6 +73,7 @@ export class SystemdJournalRemoteService extends CoreService {
   };
   static service = {
     systemdService: "systemd-journal-remote.service",
+    //extends: ["http"],
     endpoints: [
       {
         family: FAMILY_IPV4,