apunkt/SurfSense
1
0
Fork 0
mirror of https://github.com/MODSetter/SurfSense.git synced 2026-06-20 21:18:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

refactor(web): update environment variable references to use HOSTED_BACKEND_URL for improved consistency across workflows and scripts

Browse source
This commit is contained in:
Anish Sarkar 2026-06-16 16:15:45 +05:30
parent 695da76f2e
commit 97ac02eba8
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/desktop-release.yml vendored
View file

@ -95,8 +95,8 @@ jobs:
run: pnpm build run: pnpm build
working-directory: surfsense_web working-directory: surfsense_web
env: env:
NEXT_PUBLIC_FASTAPI_BACKEND_URL: ${{ vars.NEXT_PUBLIC_FASTAPI_BACKEND_URL }} NEXT_PUBLIC_FASTAPI_BACKEND_URL: ${{ vars.HOSTED_BACKEND_URL }}
SURFSENSE_BACKEND_INTERNAL_URL: ${{ vars.NEXT_PUBLIC_FASTAPI_BACKEND_URL }} SURFSENSE_BACKEND_INTERNAL_URL: ${{ vars.HOSTED_BACKEND_URL }}
NEXT_PUBLIC_ZERO_CACHE_URL: ${{ vars.NEXT_PUBLIC_ZERO_CACHE_URL }} NEXT_PUBLIC_ZERO_CACHE_URL: ${{ vars.NEXT_PUBLIC_ZERO_CACHE_URL }}
NEXT_PUBLIC_DEPLOYMENT_MODE: ${{ vars.NEXT_PUBLIC_DEPLOYMENT_MODE }} NEXT_PUBLIC_DEPLOYMENT_MODE: ${{ vars.NEXT_PUBLIC_DEPLOYMENT_MODE }}
NEXT_PUBLIC_AUTH_TYPE: ${{ vars.NEXT_PUBLIC_AUTH_TYPE }} NEXT_PUBLIC_AUTH_TYPE: ${{ vars.NEXT_PUBLIC_AUTH_TYPE }}
@ -111,6 +111,7 @@ jobs:
run: pnpm build run: pnpm build
working-directory: surfsense_desktop working-directory: surfsense_desktop
env: env:
HOSTED_BACKEND_URL: ${{ vars.HOSTED_BACKEND_URL }}
HOSTED_FRONTEND_URL: ${{ vars.HOSTED_FRONTEND_URL }} HOSTED_FRONTEND_URL: ${{ vars.HOSTED_FRONTEND_URL }}
POSTHOG_KEY: ${{ secrets.POSTHOG_KEY }} POSTHOG_KEY: ${{ secrets.POSTHOG_KEY }}
POSTHOG_HOST: ${{ vars.POSTHOG_HOST }} POSTHOG_HOST: ${{ vars.POSTHOG_HOST }}

5
surfsense_desktop/scripts/build-electron.mjs
View file

@ -108,8 +108,11 @@ async function buildElectron() {
sourcemap: true, sourcemap: true,
minify: false, minify: false,
define: { define: {
'process.env.HOSTED_BACKEND_URL': JSON.stringify(
process.env.HOSTED_BACKEND_URL || desktopEnv.HOSTED_BACKEND_URL || ''
),
'process.env.HOSTED_FRONTEND_URL': JSON.stringify( 'process.env.HOSTED_FRONTEND_URL': JSON.stringify(
process.env.HOSTED_FRONTEND_URL || desktopEnv.HOSTED_FRONTEND_URL || 'https://surfsense.net' process.env.HOSTED_FRONTEND_URL || desktopEnv.HOSTED_FRONTEND_URL || 'https://surfsense.com'
), ),
'process.env.POSTHOG_KEY': JSON.stringify( 'process.env.POSTHOG_KEY': JSON.stringify(
process.env.POSTHOG_KEY || desktopEnv.POSTHOG_KEY || '' process.env.POSTHOG_KEY || desktopEnv.POSTHOG_KEY || ''

2
surfsense_desktop/src/modules/server.ts
View file

@ -43,11 +43,13 @@ export async function startNextServer(): Promise<void> {
const standalonePath = getStandalonePath(); const standalonePath = getStandalonePath();
const serverScript = path.join(standalonePath, 'server.js'); const serverScript = path.join(standalonePath, 'server.js');
const backendInternalUrl = process.env.SURFSENSE_BACKEND_INTERNAL_URL || process.env.HOSTED_BACKEND_URL;
const child = utilityProcess.fork(serverScript, [], { const child = utilityProcess.fork(serverScript, [], {
cwd: standalonePath, cwd: standalonePath,
env: { env: {
...process.env, ...process.env,
...(backendInternalUrl ? { SURFSENSE_BACKEND_INTERNAL_URL: backendInternalUrl } : {}),
PORT: String(serverPort), PORT: String(serverPort),
// Loopback bind: avoids 0.0.0.0 leaking into request.url and redirect origins. // Loopback bind: avoids 0.0.0.0 leaking into request.url and redirect origins.
HOSTNAME: SERVER_HOST, HOSTNAME: SERVER_HOST,