Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion app/lib/db.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,16 @@ function databaseUrl(): string {
return url;
}

export const sql = postgres(databaseUrl(), { ssl: 'require' });
/**
* SSL mode is configurable via DATABASE_SSL because internal/private Postgres
* instances (e.g. Coolify's docker-network Postgres) often don't terminate TLS,
* which causes ECONNRESET on connect if ssl is forced to 'require'.
* Defaults to 'require' to preserve prior behavior for externally-hosted DBs.
*/
function sslMode(): 'require' | false {
const mode = process.env['DATABASE_SSL']?.trim().toLowerCase();
if (mode === 'disable' || mode === 'false') return false;
return 'require';
}

export const sql = postgres(databaseUrl(), { ssl: sslMode() });
8 changes: 7 additions & 1 deletion server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,16 @@ const PING_INTERVAL_MS = 30_000;
const SEEN_THROTTLE_MS = 60_000;
const WS_PATH = '/api/nodes/ws';

function sslMode(): 'require' | false {
const mode = process.env.DATABASE_SSL?.trim().toLowerCase();
if (mode === 'disable' || mode === 'false') return false;
return 'require';
}

function createDb() {
const url = process.env.DATABASE_URL?.trim();
if (!url) throw new Error('DATABASE_URL is not set');
return postgres(url, { ssl: 'require' });
return postgres(url, { ssl: sslMode() });
}

const db = createDb();
Expand Down
11 changes: 11 additions & 0 deletions tests/lib/db-bootstrap.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,17 @@ describe('app/lib/db bootstrap', () => {
});
});

test('disables ssl when DATABASE_SSL=disable (internal/private Postgres)', async () => {
process.env.DATABASE_SSL = 'disable';
vi.resetModules();
await import('@/app/lib/db');

expect(postgresMock).toHaveBeenCalledWith('postgres://user:pass@localhost:5432/testdb', {
ssl: false,
});
delete process.env.DATABASE_SSL;
});

test('throws when DATABASE_URL is missing', async () => {
delete process.env.DATABASE_URL;
vi.resetModules();
Expand Down
Loading