Merge pull request #8615 from sagemathinc/hub-config-via-env

hub: configure more params via env variables

Author: williamstein

src/packages/backend/data.ts

@@ -171,14 +171,28 @@ export function sslConfigToPsqlEnv(config: SSLConfig): PsqlSSLEnvConfig {
 
 export const root: string = process.env.COCALC_ROOT ?? determineRootFromPath();
 export const data: string = process.env.DATA ?? join(root, "data");
+
+// Database Config
 export const pguser: string = process.env.PGUSER ?? "smc";
 export const pgdata: string = process.env.PGDATA ?? join(data, "postgres");
 export const pghost: string = process.env.PGHOST ?? join(pgdata, "socket");
 export const pgssl = sslConfigFromCoCalcEnv();
 export const pgdatabase: string =
   process.env.SMC_DB ?? process.env.PGDATABASE ?? "smc";
+
+// Database healthchecks
+export const pgConcurrentWarn: number = parseInt(
+  process.env.COCALC_HEALTH_PG_CONCURRENT_WARN ?? "300",
+);
+
+// Hub server configuration
+export const hubHostname: string =
+  process.env.COCALC_HUB_HOSTNAME ?? "127.0.0.1";
+export const agentPort: number = parseInt(process.env.COCALC_AGENT_PORT ?? "0");
+
 export const projects: string =
   process.env.PROJECTS ?? join(data, "projects", "[project_id]");
+
 export const secrets: string = process.env.SECRETS ?? join(data, "secrets");
 
 // Where the sqlite database files used for sync are stored.

src/packages/hub/hub.ts

@@ -11,11 +11,15 @@ import { callback } from "awaiting";
 import blocked from "blocked";
 import { spawn } from "child_process";
 import { program as commander, Option } from "commander";
+
 import basePath from "@cocalc/backend/base-path";
 import {
   pghost as DEFAULT_DB_HOST,
   pgdatabase as DEFAULT_DB_NAME,
   pguser as DEFAULT_DB_USER,
+  pgConcurrentWarn as DEFAULT_DB_CONCURRENT_WARN,
+  hubHostname as DEFAULT_HUB_HOSTNAME,
+  agentPort as DEFAULT_AGENT_PORT,
 } from "@cocalc/backend/data";
 import { trimLogFileSize } from "@cocalc/backend/logger";
 import port from "@cocalc/backend/port";
@@ -352,14 +356,14 @@ async function main(): Promise<void> {
     )
     .option(
       "--agent-port <n>",
-      "port for HAProxy agent-check (default: 0 -- do not start)",
+      `port for HAProxy agent-check (default: ${DEFAULT_AGENT_PORT}; 0 means "do not start")`,
       (n) => parseInt(n),
-      0,
+      DEFAULT_AGENT_PORT,
     )
     .option(
       "--hostname [string]",
-      'host of interface to bind to (default: "127.0.0.1")',
-      "127.0.0.1",
+      `host of interface to bind to (default: "${DEFAULT_HUB_HOSTNAME}")`,
+      DEFAULT_HUB_HOSTNAME,
     )
     .option(
       "--database-nodes <string,string,...>",
@@ -407,9 +411,9 @@ async function main(): Promise<void> {
     )
     .option(
       "--db-concurrent-warn <n>",
-      "be very unhappy if number of concurrent db requests exceeds this (default: 300)",
+      `be very unhappy if number of concurrent db requests exceeds this (default: ${DEFAULT_DB_CONCURRENT_WARN})`,
       (n) => parseInt(n),
-      300,
+      DEFAULT_DB_CONCURRENT_WARN,
     )
     .option(
       "--personal",