self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Fixed config

Browse Source
This commit is contained in:
Laurent Cozic 2021-07-25 14:21:41 +01:00
parent fb9ec105df
commit 8b08f0d2b3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/server/src/config.ts
View File

@ -138,12 +138,13 @@ export async function initConfig(envType: Env, env: EnvVariables, overrides: any
const viewDir = `${rootDir}/src/views`; const viewDir = `${rootDir}/src/views`;
const appPort = env.APP_PORT ? Number(env.APP_PORT) : 22300; const appPort = env.APP_PORT ? Number(env.APP_PORT) : 22300;
const baseUrl = baseUrlFromEnv(env, appPort); const baseUrl = baseUrlFromEnv(env, appPort);
const apiBaseUrl = env.API_BASE_URL ? env.API_BASE_URL : baseUrl;
const supportEmail = env.SUPPORT_EMAIL || 'SUPPORT_EMAIL'; // Defaults to "SUPPORT_EMAIL" so that server admin knows they have to set it. const supportEmail = env.SUPPORT_EMAIL || 'SUPPORT_EMAIL'; // Defaults to "SUPPORT_EMAIL" so that server admin knows they have to set it.
config_ = { config_ = {
appVersion: packageJson.version, appVersion: packageJson.version,
appName: env.APP_NAME || 'Joplin Server', appName: env.APP_NAME || 'Joplin Server',
isJoplinCloud: env.API_BASE_URL.includes('.joplincloud.com'), isJoplinCloud: apiBaseUrl.includes('.joplincloud.com'),
env: envType, env: envType,
rootDir: rootDir, rootDir: rootDir,
viewDir: viewDir, viewDir: viewDir,
@ -156,7 +157,7 @@ export async function initConfig(envType: Env, env: EnvVariables, overrides: any
port: appPort, port: appPort,
baseUrl, baseUrl,
showErrorStackTraces: (env.ERROR_STACK_TRACES === undefined && envType === Env.Dev) || env.ERROR_STACK_TRACES === '1', showErrorStackTraces: (env.ERROR_STACK_TRACES === undefined && envType === Env.Dev) || env.ERROR_STACK_TRACES === '1',
apiBaseUrl: env.API_BASE_URL ? env.API_BASE_URL : baseUrl, apiBaseUrl,
userContentBaseUrl: env.USER_CONTENT_BASE_URL ? env.USER_CONTENT_BASE_URL : baseUrl, userContentBaseUrl: env.USER_CONTENT_BASE_URL ? env.USER_CONTENT_BASE_URL : baseUrl,
signupEnabled: env.SIGNUP_ENABLED === '1', signupEnabled: env.SIGNUP_ENABLED === '1',
termsEnabled: env.TERMS_ENABLED === '1', termsEnabled: env.TERMS_ENABLED === '1',