pmcf 6.27.3 → 6.28.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.27.3",
+  "version": "6.28.1",
   "publishConfig": {
     "access": "public"
   },
@@ -54,7 +54,7 @@
     "content-entry-transform": "^1.7.0",
     "ip-utilties": "^3.12.0",
     "npm-pkgbuild": "^20.8.14",
-    "pacc": "^11.2.1",
+    "pacc": "^11.2.2",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.0"
   },

package/src/base.mjs

@@ -44,7 +44,6 @@ export class Base {
     type: type_attribute_writable,
     directory: { ...string_attribute_writable, name: "directory" },
     packaging: { ...string_set_attribute_writable, name: "packaging" },
-    disabled: { ...boolean_attribute_writable, name: "disabled" },
     enabled: { ...boolean_attribute_writable, name: "enabled" },
     tags: { ...string_set_attribute_writable, name: "tags" },
     template: { ...boolean_attribute_writable, name: "template", private: true }
@@ -404,6 +403,34 @@ export class Base {
     return this.owner?.timezone;
   }
 
+  /**
+   * @return {boolean}
+   */
+  get enabled() {
+    return this.attribute("_enabled") ?? true;
+  }
+
+  set enabled(value) {
+    this._enabled = value;
+  }
+
+  get tags() {
+    return this.unionFromDirections(["this", "extends"], "_tags");
+  }
+
+  set tags(value) {
+    this._tags = union(value, this._tags);
+  }
+
+  set aliases(value) {
+    this._aliases = union(value, this._aliases);
+  }
+
+  get aliases() {
+    return this.expand(
+      this.unionFromDirections(["this", "extends"], "_aliases")
+    );
+  }
   set priority(value) {
     this._priority = value;
   }
@@ -565,37 +592,6 @@ export class Base {
     }
   }
 
-  /**
-   * @return {boolean}
-   */
-  get enabled()
-  {
-    return !this.disabled;
-  }
-
-  set enabled(value)
-  {
-    this.disabled = !value;
-  }
-
-  get tags() {
-    return this.unionFromDirections(["this", "extends"], "_tags");
-  }
-
-  set tags(value) {
-    this._tags = union(value, this._tags);
-  }
-
-  set aliases(value) {
-    this._aliases = union(value, this._aliases);
-  }
-
-  get aliases() {
-    return this.expand(
-      this.unionFromDirections(["this", "extends"], "_aliases")
-    );
-  }
-
   /**
    * @return {boolean}
    */

package/src/core-service.mjs

@@ -14,7 +14,7 @@ import {
   Endpoint,
   DomainNameEndpoint,
   HTTPEndpoint,
-  UnixEndpoint,
+  unix_endpoint,
   addType,
   FAMILY_UNIX,
   FAMILY_DNS
@@ -137,7 +137,7 @@ export class CoreService extends Base {
     for (const e of data) {
       switch (e.family) {
         case FAMILY_UNIX:
-          result.push(new UnixEndpoint(this, e.path, e));
+          result.push(new unix_endpoint(this, e.path, e));
           break;
 
         case undefined:

package/src/endpoint.mjs

@@ -240,8 +240,7 @@ export class HTTPEndpoint extends BaseEndpoint {
   }
 }
 
-export class UnixEndpoint extends BaseEndpoint {
-  static name = "unix_endpoint";
+export class unix_endpoint extends BaseEndpoint {
   static attributes = {
     url: url_attribute
   };

package/src/network-interfaces/network-interface.mjs

@@ -196,7 +196,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
 
     if (this.name !== "eth0" && this.hwaddr) {
       const disabled = {};
-      if (this.disabled) {
+      if (!this.enabled) {
         disabled.Unmanaged = "yes";
       }
       await writeLines(networkDir, `${this.name}.link`, [
@@ -263,7 +263,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
 
     await writeLines(
       networkDir,
-      `${this.name}.network${this.disabled ? ".disabled" : ""}`,
+      `${this.name}.network${this.enabled ? "" : ".disabled"}`,
       networkSections
     );
   }

package/src/services/bind.mjs

@@ -369,11 +369,7 @@ class bind_group extends Base {
         const address = na.address;
         const host = na.host;
 
-        if (host === undefined) {
-          console.log("NO HOST", na);
-        }
-
-        if (!addresses.has(address)) {
+        if (host && !addresses.has(address)) {
           addresses.add(address);
 
           const locationName = host.owner.name;
@@ -403,7 +399,7 @@ class bind_group extends Base {
                   )
               );
 
-            if (host && !hosts.has(host)) {
+            if (!hosts.has(host)) {
               hosts.add(host);
 
               for (let foreignDomain of host.foreignDomainNames) {