wattetheria 0.2.3 → 0.2.4

package/README.md

@@ -586,8 +586,9 @@ read it from the `wattetheria_state` volume; for the full stack, read
 `./data/wattetheria/control.token`.
 
 The supervision console includes an Agent Runtime configuration card for the brain provider.
-Saving that form updates the deployment env file under `.wattetheria/deploy/.env` so the next
-service restart picks up the new runtime settings without manual env editing.
+Saving that form updates the deployment env file under `.wattetheria/deploy/.env` through the
+container's `/var/lib/wattetheria-deploy` mount, so the next service restart picks up the new
+runtime settings without manual env editing.
 
 The Logs page is now a WattSwarm Diagnostics view. It proxies authenticated
 `/v1/client/wattswarm-diagnostics` to the local Wattswarm UI API so operators can inspect

package/docker-compose.release.yml

@@ -17,13 +17,14 @@ services:
     image: ${WATTETHERIA_KERNEL_IMAGE:-wattetheria/wattetheria-kernel:latest}
     restart: unless-stopped
     env_file:
-      - ${WATTETHERIA_RUNTIME_ENV_FILE:-.env.release.local}
+      - ${WATTETHERIA_COMPOSE_ENV_FILE:-.env.release.local}
     depends_on:
       wattswarm-kernel:
         condition: service_started
     environment:
       WATTETHERIA_DATA_DIR: /var/lib/wattetheria
       WATTETHERIA_CONTROL_PLANE_BIND: 0.0.0.0:7777
+      WATTETHERIA_RUNTIME_ENV_FILE: ${WATTETHERIA_RUNTIME_ENV_FILE:-/var/lib/wattetheria-deploy/.env.release.local}
       WATTETHERIA_WATTSWARM_UI_BASE_URL: http://wattswarm-kernel:7788
       WATTETHERIA_WATTSWARM_SYNC_GRPC_ENDPOINT: http://wattswarm-kernel:7791
       WATTETHERIA_AGENT_CONTROL_PLANE_ENDPOINT: ${WATTETHERIA_AGENT_CONTROL_PLANE_ENDPOINT:-http://127.0.0.1:7777}
@@ -40,6 +41,7 @@ services:
       WATTETHERIA_AUTONOMY_ENABLED: ${WATTETHERIA_AUTONOMY_ENABLED:-false}
       WATTETHERIA_AUTONOMY_INTERVAL_SEC: ${WATTETHERIA_AUTONOMY_INTERVAL_SEC:-30}
     volumes:
+      - ${WATTETHERIA_DEPLOY_DIR:-.}:/var/lib/wattetheria-deploy
       - ${WATTETHERIA_HOST_STATE_DIR:-./data/wattetheria}:/var/lib/wattetheria
       - ${WATTSWARM_HOST_STATE_DIR:-./data/wattswarm}:/var/lib/wattswarm:ro
     ports:
@@ -110,8 +112,8 @@ services:
       WATTSWARM_UDP_ANNOUNCE_MODE: ${WATTSWARM_UDP_ANNOUNCE_MODE:-multicast}
       WATTSWARM_UDP_ANNOUNCE_ADDR: ${WATTSWARM_UDP_ANNOUNCE_ADDR:-239.255.42.99}
       WATTSWARM_UDP_ANNOUNCE_PORT: ${WATTSWARM_UDP_ANNOUNCE_PORT:-37931}
-      WATTSWARM_IROH_RELAY_URLS: ${WATTSWARM_IROH_RELAY_URLS:-}
-      WATTSWARM_IROH_PUBLISH_DIRECT_ADDRS: ${WATTSWARM_IROH_PUBLISH_DIRECT_ADDRS:-true}
+      WATTSWARM_IROH_RELAY_URLS: ${WATTSWARM_IROH_RELAY_URLS:-https://relay.wattetheria.com}
+      WATTSWARM_IROH_PUBLISH_DIRECT_ADDRS: ${WATTSWARM_IROH_PUBLISH_DIRECT_ADDRS:-false}
       WATTSWARM_PUBLIC_BOOTSTRAP_URLS: ${WATTSWARM_PUBLIC_BOOTSTRAP_URLS:-}
       WATTSWARM_PUBLIC_BOOTSTRAP_CONTACTS: ${WATTSWARM_PUBLIC_BOOTSTRAP_CONTACTS:-}
       WATTSWARM_PUBLIC_GATEWAY_URLS: ${WATTSWARM_PUBLIC_GATEWAY_URLS:-}

package/lib/cli.js

@@ -37,7 +37,9 @@ const DEFAULT_ENV_ENTRIES = [
   ["WATTSWARM_UDP_ANNOUNCE_HOST_PORT", "37931"],
   ["WATTETHERIA_HOST_STATE_DIR", "./data/wattetheria"],
   ["WATTSWARM_HOST_STATE_DIR", "./data/wattswarm"],
-  ["WATTETHERIA_RUNTIME_ENV_FILE", ".env.release.local"],
+  ["WATTETHERIA_COMPOSE_ENV_FILE", ".env.release.local"],
+  ["WATTETHERIA_DEPLOY_DIR", "."],
+  ["WATTETHERIA_RUNTIME_ENV_FILE", "/var/lib/wattetheria-deploy/.env.release.local"],
   ["WATTETHERIA_AGENT_CONTROL_PLANE_ENDPOINT", "http://127.0.0.1:7777"],
   ["WATTETHERIA_AGENT_WATTSWARM_UI_BASE_URL", "http://127.0.0.1:7788"],
   ["WATTETHERIA_AGENT_WATTSWARM_SYNC_GRPC_ENDPOINT", "http://127.0.0.1:7791"],
@@ -55,6 +57,8 @@ const DEFAULT_ENV_ENTRIES = [
   ["WATTSWARM_P2P_ENABLED", "true"],
   ["WATTSWARM_P2P_MDNS", "true"],
   ["WATTSWARM_P2P_PORT", "4001"],
+  ["WATTSWARM_IROH_RELAY_URLS", "https://relay.wattetheria.com"],
+  ["WATTSWARM_IROH_PUBLISH_DIRECT_ADDRS", "false"],
   ["WATTSWARM_WORKER_CONCURRENCY", "16"],
   ["WATTSWARM_WORKER_POLL_MS", "250"],
   ["WATTSWARM_WORKER_LEASE_MS", "30000"],
@@ -708,7 +712,10 @@ function ensureDeploymentAssets(options) {
   refreshDeploymentComposeAsset(templateComposePath, targetComposePath, options);
 
   const envMap = readEnvFile(targetEnvPath);
-  envMap.set("WATTETHERIA_RUNTIME_ENV_FILE", path.basename(targetEnvPath));
+  const envFileName = path.basename(targetEnvPath);
+  envMap.set("WATTETHERIA_COMPOSE_ENV_FILE", envFileName);
+  envMap.set("WATTETHERIA_DEPLOY_DIR", ".");
+  envMap.set("WATTETHERIA_RUNTIME_ENV_FILE", `/var/lib/wattetheria-deploy/${envFileName}`);
   ensureDatabasePassword(envMap);
   if (options.tag) {
     pinImageTags(envMap, options.tag);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wattetheria",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Wattetheria deployment CLI",
   "license": "Apache-2.0",
   "type": "commonjs",