pmcf 2.40.5 → 2.41.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.40.5",
+  "version": "2.41.1",
   "publishConfig": {
     "access": "public"
   },
@@ -18,7 +18,8 @@
     "dns",
     "kea",
     "keepalived",
-    "systemd"
+    "systemd",
+    "iwd"
   ],
   "contributors": [
     {

package/src/network-interfaces/wlan.mjs

@@ -51,7 +51,21 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
 
   async systemdDefinitions(packageData) {
     await super.systemdDefinitions(packageData);
+    const d = join(packageData.dir, "var/lib/iwd/");
+    await mkdir(d, { recursive: true });
 
+    /*
+    writeFile(
+      join(d, `${this.network.name}.psk`),
+      `[Security]
+Passphrase=
+SAE-PT-Group19=
+SAE-PT-Group20=
+`,
+      "utf8"
+    );
+*/
+    /*
     const d = join(packageData.dir, "etc/wpa_supplicant");
     await mkdir(d, { recursive: true });
     writeFile(
@@ -73,5 +87,7 @@ network={
       "post_install",
       `systemctl enable wpa_supplicant@${this.name}.service`
     );
+
+  */
   }
 }

package/src/services/bind.mjs

@@ -300,20 +300,20 @@ export class BINDService extends ExtraSourceService {
 
     yield this.generateZoneDefs(sources, packageData);
 
-    const foreignZonesPackageDir = join(dir, "foreignZones") + "/";
+    const outfacingZonesPackageDir = join(dir, "outfacingZones") + "/";
 
-    packageData.dir = foreignZonesPackageDir;
+    packageData.dir = outfacingZonesPackageDir;
     packageData.properties = {
-      name: `named-zones-${name}-FOREIGN`,
-      description: `foreign zone definitions for ${names}`,
-      replaces: [`named-foreign-zones-${name}`],
+      name: `named-zones-${name}-OUTFACING`,
+      description: `outfacing zone definitions for ${names}`,
+      replaces: [`named-foreign-zones-${name}`,`named-zones-${name}-FOREIGN`],
       access: "private",
       hooks: {}
     };
 
     packageData.sources = [
       new FileContentProvider(
-        foreignZonesPackageDir,
+        outfacingZonesPackageDir,
         {
           mode: 0o644,
           owner: "named",
@@ -327,25 +327,25 @@ export class BINDService extends ExtraSourceService {
       )
     ];
 
-    yield this.generateForeignDefs(sources, packageData);
+    yield this.generateOutfacingDefs(sources, packageData);
   }
 
-  async generateForeignDefs(sources, packageData) {
+  async generateOutfacingDefs(sources, packageData) {
     const configs = [];
 
     for (const source of sources) {
       for (const host of source.hosts()) {
-        configs.push(...this.foreignDomainZones(host, this.defaultRecords));
+        configs.push(...this.outfacingZones(host, this.defaultRecords));
       }
     }
 
-    const foreignZones = configs.map(c => c.zones).flat();
+    const outfacingZones = configs.map(c => c.zones).flat();
 
-    if (foreignZones.length) {
+    if (outfacingZones.length) {
       addHook(
         packageData.properties.hooks,
         "post_upgrade",
-        `/usr/bin/named-hostname-info ${foreignZones
+        `/usr/bin/named-hostname-info ${outfacingZones
           .map(zone => zone.id)
           .join(" ")}|/usr/bin/named-hostname-update`
       );
@@ -498,11 +498,11 @@ export class BINDService extends ExtraSourceService {
     return packageData;
   }
 
-  foreignDomainZones(host, records) {
+  outfacingZones(host, records) {
     return host.foreignDomainNames.map(domain => {
       const zone = {
         id: domain,
-        file: `FOREIGN/${domain}.zone`,
+        file: `OUTFACING/${domain}.zone`,
         records: new Set(records)
       };
       const config = {

package/types/services/bind.d.mts

@@ -383,9 +383,9 @@ export class BINDService extends ExtraSourceService {
     set excludeInterfaceKinds(value: Set<any>);
     get excludeInterfaceKinds(): Set<any>;
     preparePackages(dir: any): AsyncGenerator<any, void, unknown>;
-    generateForeignDefs(sources: any, packageData: any): Promise<any>;
+    generateOutfacingDefs(sources: any, packageData: any): Promise<any>;
     generateZoneDefs(sources: any, packageData: any): Promise<any>;
-    foreignDomainZones(host: any, records: any): any;
+    outfacingZones(host: any, records: any): any;
     get defaultRecords(): {
         type: any;
         key: any;