consolidate runtime env into .env, drop ecosystem env blocks (#1229)
- Make .env the single source of truth for runtime config. Remove all
`env:` blocks from SREBOT/ecosystem.config.js and TSSBOT/ecosystem.config.js
so values can't silently shadow .env. Both ecosystem files load .env via
`require('dotenv').config()` and PM2 inherits the resolved environment.
- Rename SREBOT_STORAGE_VOL_PATH → STORAGE_VOL_PATH across all readers
(BOT/utils.py, BOT/receiver_bridge.py, BOT/render_recap.py, server.js,
web/server.js, dateindex.js, scripts/*, srebot.service, tests/, README,
and both .env files). STORAGE is shared between SREBOT and TSSBOT, so the
variable shouldn't carry one bot's prefix.
- Rename per-process PORT env vars to disambiguated names so .env can be
the source of truth without collisions:
PORT (api) → SREBOT_API_PORT (server.js)
PORT (web) → SREBOT_WEB_PORT (web/server.js)
WEBHOOK_PORT → SREBOT_WEBHOOK_PORT (github_webhook_updater.py)
SREBOT_EXTERNAL_HOST/PORT/UPSTREAM_URL were already uniquely named;
they just move from ecosystem env to .env.
- TSSBOT/.env: drop GITHUB_WEBHOOK_SECRET (only srebot-webhook consumes it)
and the stale SREBOT_DEPLOY_PATH. SREBOT/.env: also drop the obsolete
SREBOT_DEPLOY_PATH (ecosystem now hardcodes __dirname).
- ecosystem.config.js no longer references SREBOT_DEPLOY_PATH; deploy path
is always __dirname of the ecosystem file.
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
+9
-28
@@ -1,6 +1,9 @@
|
||||
// Single source of truth for runtime config is SREBOT/.env (loaded here).
|
||||
// Do NOT add `env:` blocks to apps below — they would override the .env values
|
||||
// and create two parallel config sources to reason about.
|
||||
require('dotenv').config();
|
||||
|
||||
const DEPLOY_PATH = process.env.SREBOT_DEPLOY_PATH || __dirname;
|
||||
const DEPLOY_PATH = __dirname;
|
||||
|
||||
module.exports = {
|
||||
apps: [
|
||||
@@ -14,10 +17,6 @@ module.exports = {
|
||||
autorestart: true,
|
||||
watch: false,
|
||||
max_memory_restart: '16000M',
|
||||
env: {
|
||||
NODE_ENV: 'production',
|
||||
PYTHONUNBUFFERED: '1'
|
||||
},
|
||||
log_file: './logs/bot_combined.log',
|
||||
out_file: './logs/bot_out.log',
|
||||
error_file: './logs/bot_error.log',
|
||||
@@ -27,7 +26,7 @@ module.exports = {
|
||||
restart_delay: 3000
|
||||
},
|
||||
|
||||
// API Server
|
||||
// API Server (reads SREBOT_API_PORT from .env)
|
||||
{
|
||||
name: 'srebot-api',
|
||||
script: 'server.js',
|
||||
@@ -38,10 +37,6 @@ module.exports = {
|
||||
autorestart: true,
|
||||
watch: false,
|
||||
max_memory_restart: '4G',
|
||||
env: {
|
||||
NODE_ENV: 'production',
|
||||
PORT: 6000
|
||||
},
|
||||
log_file: './logs/api_combined.log',
|
||||
out_file: './logs/api_out.log',
|
||||
error_file: './logs/api_error.log',
|
||||
@@ -54,6 +49,7 @@ module.exports = {
|
||||
// External bridge for AXBot traffic:
|
||||
// - Proxies read-only API queries to the internal SREBOT API
|
||||
// - Streams bridge envelopes to AXBot over websocket
|
||||
// Reads SREBOT_EXTERNAL_HOST/PORT/UPSTREAM_URL from .env.
|
||||
{
|
||||
name: 'srebot-axbot',
|
||||
script: 'BOT/srebot_external.py',
|
||||
@@ -63,13 +59,6 @@ module.exports = {
|
||||
autorestart: true,
|
||||
watch: false,
|
||||
max_memory_restart: '1G',
|
||||
env: {
|
||||
NODE_ENV: 'production',
|
||||
PYTHONUNBUFFERED: '1',
|
||||
SREBOT_EXTERNAL_HOST: '0.0.0.0',
|
||||
SREBOT_EXTERNAL_PORT: 18081,
|
||||
SREBOT_EXTERNAL_UPSTREAM_URL: 'http://127.0.0.1:6000'
|
||||
},
|
||||
log_file: './logs/axbot_combined.log',
|
||||
out_file: './logs/axbot_out.log',
|
||||
error_file: './logs/axbot_error.log',
|
||||
@@ -79,7 +68,8 @@ module.exports = {
|
||||
restart_delay: 2000
|
||||
},
|
||||
|
||||
// GitHub Webhook Receiver (auto-deploy on push to main)
|
||||
// GitHub Webhook Receiver (auto-deploy on push to main).
|
||||
// Reads SREBOT_WEBHOOK_PORT from .env.
|
||||
{
|
||||
name: 'srebot-webhook',
|
||||
script: 'github_webhook_updater.py',
|
||||
@@ -89,11 +79,6 @@ module.exports = {
|
||||
autorestart: true,
|
||||
watch: false,
|
||||
max_memory_restart: '500M',
|
||||
env: {
|
||||
NODE_ENV: 'production',
|
||||
PYTHONUNBUFFERED: '1',
|
||||
WEBHOOK_PORT: 9000
|
||||
},
|
||||
log_file: './logs/webhook_combined.log',
|
||||
out_file: './logs/webhook_out.log',
|
||||
error_file: './logs/webhook_error.log',
|
||||
@@ -103,7 +88,7 @@ module.exports = {
|
||||
restart_delay: 2000
|
||||
},
|
||||
|
||||
// Website (Next.js)
|
||||
// Website (reads SREBOT_WEB_PORT from .env)
|
||||
{
|
||||
name: 'srebot-web',
|
||||
script: 'server.js',
|
||||
@@ -113,10 +98,6 @@ module.exports = {
|
||||
autorestart: true,
|
||||
watch: false,
|
||||
max_memory_restart: '500M',
|
||||
env: {
|
||||
NODE_ENV: 'production',
|
||||
PORT: 3001
|
||||
},
|
||||
log_file: './logs/web_combined.log',
|
||||
out_file: './logs/web_out.log',
|
||||
error_file: './logs/web_error.log',
|
||||
|
||||
Reference in New Issue
Block a user