pmcf 2.7.0 → 2.8.0

package/package.json

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

package/src/host.mjs

@@ -107,7 +107,7 @@ export class Host extends Base {
     if (data.extends) {
       this.finalize(() => {
         for (const host of this.extends) {
-          if(host === this) {
+          if (host === this) {
             this.error("Cant extend myself");
           }
           host.execFinalize();
@@ -637,11 +637,13 @@ export class NetworkInterface extends Base {
     return this;
   }
 
+  extendedProperty(name) {
+    return this.extends.find(i => i[name])?.[name];
+  }
+
   get network() {
     return (
-      this._network ??
-      this.extends.find(i => i.network)?.network ??
-      this.host.network
+      this._network ?? this.extendedProperty("_network") ?? this.host.network
     );
   }
 
@@ -656,7 +658,7 @@ export class NetworkInterface extends Base {
   get scope() {
     return (
       this._scope ??
-      this.extends.find(i => i.scope)?.scope ??
+      this.extendedProperty("_scope") ??
       this.network?.scope ??
       "global"
     );
@@ -667,7 +669,7 @@ export class NetworkInterface extends Base {
   }
 
   get hwaddr() {
-    return this._hwaddr ?? this.extends.find(i => i._hwaddr)?._hwaddr;
+    return this._hwaddr ?? this.extendedProperty("_hwaddr");
   }
 
   set metric(value) {
@@ -675,7 +677,12 @@ export class NetworkInterface extends Base {
   }
 
   get metric() {
-    return this._metric ?? this.network?.metric ?? 1004;
+    return (
+      this._metric ??
+      this.extendedProperty("_metric") ??
+      this.network?.metric ??
+      1004
+    );
   }
 
   set ssid(value) {
@@ -683,9 +690,7 @@ export class NetworkInterface extends Base {
   }
 
   get ssid() {
-    return (
-      this._ssid ?? this.extends.find(i => i.ssid)?.ssid ?? this.network?.ssid
-    );
+    return this._ssid ?? this.extendedProperty("_ssid") ?? this.network?.ssid;
   }
 
   set psk(value) {
@@ -693,7 +698,7 @@ export class NetworkInterface extends Base {
   }
 
   get psk() {
-    return this._psk ?? this.extends.find(i => i.psk)?.psk ?? this.network?.psk;
+    return this._psk ?? this.extendedProperty("_psk") ?? this.network?.psk;
   }
 
   set kind(value) {
@@ -702,7 +707,7 @@ export class NetworkInterface extends Base {
 
   get kind() {
     return (
-      this._kind ?? this.extends.find(i => i.kind)?.kind ?? this.network?.kind
+      this._kind ?? this.extendedProperty("_kind") ?? this.network?.kind
     );
   }
 }

package/src/services/ntp.mjs

@@ -1,6 +1,12 @@
+import { join } from "node:path";
+import { FileContentProvider } from "npm-pkgbuild";
 import { addType } from "../types.mjs";
 import { ServiceTypeDefinition, serviceAddresses } from "../service.mjs";
-import { ExtraSourceService, ExtraSourceServiceTypeDefinition } from "../extra-source-service.mjs";
+import {
+  ExtraSourceService,
+  ExtraSourceServiceTypeDefinition
+} from "../extra-source-service.mjs";
+import { writeLines } from "../utils.mjs";
 
 const NTPServiceTypeDefinition = {
   name: "ntp",
@@ -47,4 +53,45 @@ export class NTPService extends ExtraSourceService {
       }
     ];
   }
+
+  async *preparePackages(dir) {
+    const network = this.network;
+    const host = this.server;
+    const name = host.name;
+
+    console.log("chrony", host.name, network.name);
+
+    const packageData = {
+      dir,
+      sources: [new FileContentProvider(dir + "/")[Symbol.asyncIterator]()],
+      outputs: this.outputs,
+      properties: {
+        name: `chrony-${this.location.name}-${host.name}`,
+        description: `chrony definitions for ${this.fullName}@${name}`,
+        access: "private",
+        dependencies: ["chrony>=4.6.1"]
+      }
+    };
+
+    const lines = [
+      ...serviceAddresses(this, {
+        ...NTP_SERVICE_FILTER,
+        priority: ">=10"
+      }).map(address => `server ${address} iburst`),
+      `mailonchange ${this.administratorEmail} 0.5`,
+      "local stratum 10",
+      "leapsectz right/UTC",
+      "makestep 1.0 3",
+      "ratelimit interval 3 burst 8",
+      "cmdratelimit interval -4 burst 16",
+      "driftfile /var/lib/chrony/drift",
+      "ntsdumpdir /var/lib/chrony",
+      "dumpdir /var/lib/chrony",
+      "pidfile /run/chrony/chronyd.pid"
+    ];
+
+    await writeLines(join(dir, "etc"), "chrony.conf", lines);
+
+    yield packageData;
+  }
 }

package/types/host.d.mts

@@ -432,6 +432,7 @@ export class NetworkInterface extends Base {
     get hostName(): any;
     get domainNames(): any;
     get network_interface(): this;
+    extendedProperty(name: any): any;
     set network(network: any);
     get network(): any;
     set scope(value: any);

package/types/services/ntp.d.mts

@@ -264,5 +264,16 @@ export class NTPService extends ExtraSourceService {
     get systemdConfig(): (string | {
         NTP: string;
     })[];
+    preparePackages(dir: any): AsyncGenerator<{
+        dir: any;
+        sources: AsyncIterable<import("content-entry").ContentEntry>[];
+        outputs: Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;
+        properties: {
+            name: string;
+            description: string;
+            access: string;
+            dependencies: string[];
+        };
+    }, void, unknown>;
 }
 import { ExtraSourceService } from "../extra-source-service.mjs";