github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4298 from overleaf/jpa-separate-defaults-per-env

Browse source 
[config] separate default files for Server CE/Server Pro/SAAS

GitOrigin-RevId: 532aac7855303490d37c4dff2974106cc5e45705
This commit is contained in:
Jakob Ackermann 2021-07-12 12:40:06 +02:00 committed by Copybot
parent 295fd61317
commit f2be7f4909
1 changed files with 14 additions and 258 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

272
services/web/config/settings.defaults.js
View file

@ -1,3 +1,5 @@
const { merge } = require('@overleaf/settings/merge')
let defaultFeatures, siteUrl let defaultFeatures, siteUrl
const http = require('http') const http = require('http')
http.globalAgent.maxSockets = 300 http.globalAgent.maxSockets = 300
@ -141,12 +143,6 @@ module.exports = {
process.env.REDIS_MAX_RETRIES_PER_REQUEST || '20' process.env.REDIS_MAX_RETRIES_PER_REQUEST || '20'
), ),
}, },
queues: {
host: process.env.QUEUES_REDIS_HOST || 'localhost',
port: process.env.QUEUES_REDIS_PORT || '6379',
password: process.env.QUEUES_REDIS_PASSWORD || '',
},
}, },
// Service locations // Service locations
@ -162,10 +158,6 @@ module.exports = {
}, },
}, },
gitBridgePublicBaseUrl: `http://${
process.env.GIT_BRIDGE_HOST || 'localhost'
}:8000`,
// Tell each service where to find the other services. If everything // Tell each service where to find the other services. If everything
// is running locally then this is easy, but they exist as separate config // is running locally then this is easy, but they exist as separate config
// options incase you want to run some services on remote hosts. // options incase you want to run some services on remote hosts.
@ -184,11 +176,6 @@ module.exports = {
'localhost' 'localhost'
}:3003`, }:3003`,
}, },
thirdPartyDataStore: {
url: `http://${process.env.TPDS_HOST || 'localhost'}:3002`,
emptyProjectFlushDelayMiliseconds: 5 * seconds,
dropboxApp: process.env.TPDS_DROPBOX_APP,
},
spelling: { spelling: {
url: `http://${process.env.SPELLING_HOST || 'localhost'}:3005`, url: `http://${process.env.SPELLING_HOST || 'localhost'}:3005`,
host: process.env.SPELLING_HOST, host: process.env.SPELLING_HOST,
@ -196,15 +183,6 @@ module.exports = {
trackchanges: { trackchanges: {
url: `http://${process.env.TRACK_CHANGES_HOST || 'localhost'}:3015`, url: `http://${process.env.TRACK_CHANGES_HOST || 'localhost'}:3015`,
}, },
project_history: {
sendProjectStructureOps:
process.env.PROJECT_HISTORY_ENABLED === 'true' || false,
initializeHistoryForNewProjects:
process.env.PROJECT_HISTORY_ENABLED === 'true' || false,
displayHistoryForNewProjects:
process.env.PROJECT_HISTORY_ENABLED === 'true' || false,
url: `http://${process.env.PROJECT_HISTORY_HOST || 'localhost'}:3054`,
},
docstore: { docstore: {
url: `http://${process.env.DOCSTORE_HOST || 'localhost'}:3016`, url: `http://${process.env.DOCSTORE_HOST || 'localhost'}:3016`,
pubUrl: `http://${process.env.DOCSTORE_HOST || 'localhost'}:3016`, pubUrl: `http://${process.env.DOCSTORE_HOST || 'localhost'}:3016`,
@ -212,13 +190,6 @@ module.exports = {
chat: { chat: {
internal_url: `http://${process.env.CHAT_HOST || 'localhost'}:3010`, internal_url: `http://${process.env.CHAT_HOST || 'localhost'}:3010`,
}, },
blog: {
url: 'http://localhost:3008',
port: 3008,
},
university: {
url: 'http://localhost:3011',
},
filestore: { filestore: {
url: `http://${process.env.FILESTORE_HOST || 'localhost'}:3009`, url: `http://${process.env.FILESTORE_HOST || 'localhost'}:3009`,
}, },
@ -227,128 +198,22 @@ module.exports = {
// url: "http://#{process.env['CLSI_LB_HOST']}:3014" // url: "http://#{process.env['CLSI_LB_HOST']}:3014"
backendGroupName: undefined, backendGroupName: undefined,
}, },
templates: {
url: `http://${process.env.TEMPLATES_HOST || 'localhost'}:3007`,
},
githubSync: {
url: `http://${process.env.GITHUB_SYNC_HOST || 'localhost'}:3022`,
},
recurly: {
apiKey: process.env.RECURLY_API_KEY || '',
apiVersion: process.env.RECURLY_API_VERSION,
subdomain: process.env.RECURLY_SUBDOMAIN || '',
publicKey: process.env.RECURLY_PUBLIC_KEY || '',
webhookUser: process.env.RECURLY_WEBHOOK_USER,
webhookPass: process.env.RECURLY_WEBHOOK_PASS,
},
geoIpLookup: {
url: `http://${
process.env.GEOIP_HOST || process.env.FREEGEOIP_HOST || 'localhost'
}:8080/json/`,
},
realTime: { realTime: {
url: `http://${process.env.REALTIME_HOST || 'localhost'}:3026`, url: `http://${process.env.REALTIME_HOST || 'localhost'}:3026`,
}, },
contacts: { contacts: {
url: `http://${process.env.CONTACTS_HOST || 'localhost'}:3036`, url: `http://${process.env.CONTACTS_HOST || 'localhost'}:3036`,
}, },
sixpack: {
url: '',
},
references: {
url:
process.env.REFERENCES_HOST != null
? `http://${process.env.REFERENCES_HOST}:3040`
: undefined,
},
notifications: { notifications: {
url: `http://${process.env.NOTIFICATIONS_HOST || 'localhost'}:3042`, url: `http://${process.env.NOTIFICATIONS_HOST || 'localhost'}:3042`,
}, },
analytics: {
url: `http://${process.env.ANALYTICS_HOST || 'localhost'}:3050`, // For legacy reasons, we need to populate the below objects.
}, v1: {},
linkedUrlProxy: { recurly: {},
url: process.env.LINKED_URL_PROXY,
},
thirdpartyreferences: {
url: `http://${
process.env.THIRD_PARTY_REFERENCES_HOST || 'localhost'
}:3046`,
timeout: parseInt(
process.env.THIRD_PARTY_REFERENCES_TIMEOUT || '30000',
10
),
},
v1: {
url:
process.env.V1_API_URL || process.env.V1_HOST
? process.env.V1_API_URL || `http://${process.env.V1_HOST}:5000`
: undefined,
user: process.env.V1_API_USER || undefined,
pass: process.env.V1_API_PASSWORD || undefined,
},
v1_history: {
url: `http://${process.env.V1_HISTORY_HOST || 'localhost'}:3100/api`,
user: process.env.V1_HISTORY_USER || 'staging',
pass: process.env.V1_HISTORY_PASSWORD || 'password',
},
}, },
templates: { splitTests: [],
user_id: process.env.TEMPLATES_USER_ID || '5395eb7aad1f29a88756c7f2',
showSocialButtons: false,
showComments: false,
},
splitTests: [
{
id: 'example-project-v2',
active: process.env.SPLITTEST_EXAMPLE_PROJECT_ACTIVE === 'true',
variants: [
{
id: 'example-frog',
rolloutPercent: parseInt(
process.env
.SPLITTEST_EXAMPLE_PROJECT_FROG_VARIANT_ROLLOUT_PERCENT || '0',
10
),
},
],
},
{
id: 'subscription-page',
active: process.env.SPLITTEST_SUBSCRIPTION_PAGE_ACTIVE === 'true',
variants: [
{
id: 'new',
rolloutPercent: parseInt(
process.env
.SPLITTEST_SUBSCRIPTION_PAGE_NEW_VARIANT_ROLLOUT_PERCENT || '0',
10
),
},
],
},
{
id: 'pdf_caching_full',
active: process.env.SPLIT_TEST_PDF_CACHING_FULL_ACTIVE === 'true',
variants: [
{
id: 'collect-metrics-and-enable-caching',
rolloutPercent: 5,
},
{
id: 'enable-caching-only',
rolloutPercent: 95,
},
],
},
],
// cdn:
// web:
// host:"http://nowhere.sharelatex.dev"
// darkHost:"http://cdn.sharelatex.dev:3000"
// Where your instance of ShareLaTeX can be found publically. Used in emails // Where your instance of ShareLaTeX can be found publically. Used in emails
// that are sent out, generated links, etc. // that are sent out, generated links, etc.
@ -405,17 +270,6 @@ module.exports = {
httpAuthUsers, httpAuthUsers,
twoFactorAuthentication: {
enabled: process.env.TWO_FACTOR_AUTHENTICATION_ENABLED === 'true',
requiredForStaff:
process.env.TWO_FACTOR_AUTHENTICATION_REQUIRED_FOR_STAFF === 'true',
},
jwt: {
key: process.env.OT_JWT_AUTH_KEY,
algorithm: process.env.OT_JWT_AUTH_ALG || 'HS256',
},
// Default features // Default features
// ---------------- // ----------------
// //
@ -547,32 +401,8 @@ module.exports = {
// AWSAccessKeyID: "" // AWSAccessKeyID: ""
// AWSSecretKey: "" // AWSSecretKey: ""
// Third party services // For legacy reasons, we need to populate this object.
// -------------------- sentry: {},
//
// ShareLaTeX's regular newsletter is managed by mailchimp. Add your
// credentials here to integrate with this.
// mailchimp:
// api_key: ""
// list_id: ""
//
// Fill in your unique token from various analytics services to enable
// them.
// analytics:
// ga:
// token: ""
// gaOptimize:
// id: ""
// ShareLaTeX's help desk is provided by tenderapp.com
// tenderUrl: ""
//
// Client-side error logging is provided by getsentry.com
sentry: {
environment: process.env.SENTRY_ENVIRONMENT,
release: process.env.SENTRY_RELEASE,
},
// publicDSN: ""
// The publicDSN is the token for the client-side getSentry service.
// Production Settings // Production Settings
// ------------------- // -------------------
@ -619,8 +449,6 @@ module.exports = {
// public projects, /learn, /templates, about pages, etc. // public projects, /learn, /templates, about pages, etc.
allowPublicAccess: process.env.SHARELATEX_ALLOW_PUBLIC_ACCESS === 'true', allowPublicAccess: process.env.SHARELATEX_ALLOW_PUBLIC_ACCESS === 'true',
enableHomepage: process.env.HOME_PAGE_ENABLED === 'true',
// editor should be open by default // editor should be open by default
editorIsOpen: process.env.EDITOR_OPEN !== 'false', editorIsOpen: process.env.EDITOR_OPEN !== 'false',
@ -697,10 +525,6 @@ module.exports = {
? JSON.parse(process.env.ADMIN_DOMAINS) ? JSON.parse(process.env.ADMIN_DOMAINS)
: undefined, : undefined,
salesEmail: process.env.SALES_EMAIL || 'placeholder@example.com',
statusPageUrl: process.env.OVERLEAF_STATUS_URL || 'status.overleaf.com',
nav: { nav: {
title: 'ShareLaTeX Community Edition', title: 'ShareLaTeX Community Edition',
@ -735,29 +559,6 @@ module.exports = {
customisation: {}, customisation: {},
// templates: [{
// name : "cv_or_resume",
// url : "/templates/cv"
// }, {
// name : "cover_letter",
// url : "/templates/cover-letters"
// }, {
// name : "journal_article",
// url : "/templates/journals"
// }, {
// name : "presentation",
// url : "/templates/presentations"
// }, {
// name : "thesis",
// url : "/templates/thesis"
// }, {
// name : "bibliographies",
// url : "/templates/bibliographies"
// }, {
// name : "view_all",
// url : "/templates"
// }]
redirects: { redirects: {
'/templates/index': '/templates/', '/templates/index': '/templates/',
}, },
@ -768,44 +569,6 @@ module.exports = {
launchpad: process.env.DISABLE_MODULE_LAUNCHPAD === 'true', launchpad: process.env.DISABLE_MODULE_LAUNCHPAD === 'true',
}, },
domainLicences: [],
sixpack: {
domain: '',
},
// ShareLaTeX Server Pro options (https://www.sharelatex.com/university/onsite.html)
// ----------
// LDAP
// ----------
// Settings below use a working LDAP test server kindly provided by forumsys.com
// When testing with forumsys.com use username = einstein and password = password
// ldap :
// host: 'ldap://ldap.forumsys.com'
// dn: 'uid=:userKey,dc=example,dc=com'
// baseSearch: 'dc=example,dc=com'
// filter: "(uid=:userKey)"
// failMessage: 'LDAP User Fail'
// fieldName: 'LDAP User'
// placeholder: 'email@example.com'
// emailAtt: 'mail'
// anonymous: false
// adminDN: 'cn=read-only-admin,dc=example,dc=com'
// adminPW: 'password'
// starttls: true
// tlsOptions:
// rejectUnauthorized: false
// ca: ['/etc/ldap/ca_certs.pem']
// templateLinks: [{
// name : "CV projects",
// url : "/templates/cv"
// },{
// name : "all projects",
// url: "/templates/all"
// }]
rateLimit: { rateLimit: {
autoCompile: { autoCompile: {
everyone: process.env.RATE_LIMIT_AUTO_COMPILE_EVERYONE || 100, everyone: process.env.RATE_LIMIT_AUTO_COMPILE_EVERYONE || 100,
@ -814,12 +577,9 @@ module.exports = {
}, },
analytics: { analytics: {
enabled: process.env.ANALYTICS_ENABLED === 'true', enabled: false,
}, },
// currentImage: "texlive-full:2017.1"
// imageRoot: "<DOCKER REPOSITORY ROOT>" # without any trailing slash
compileBodySizeLimitMb: process.env.COMPILE_BODY_SIZE_LIMIT_MB || 5, compileBodySizeLimitMb: process.env.COMPILE_BODY_SIZE_LIMIT_MB || 5,
textExtensions: defaultTextExtensions.concat( textExtensions: defaultTextExtensions.concat(
@ -831,14 +591,6 @@ module.exports = {
emailConfirmationDisabled: emailConfirmationDisabled:
process.env.EMAIL_CONFIRMATION_DISABLED === 'true' || false, process.env.EMAIL_CONFIRMATION_DISABLED === 'true' || false,
// allowedImageNames: [
// {imageName: 'texlive-full:2017.1', imageDesc: 'TeXLive 2017'}
// {imageName: 'wl_texlive:2018.1', imageDesc: 'Legacy OL TeXLive 2015'}
// {imageName: 'texlive-full:2016.1', imageDesc: 'Legacy SL TeXLive 2016'}
// {imageName: 'texlive-full:2015.1', imageDesc: 'Legacy SL TeXLive 2015'}
// {imageName: 'texlive-full:2014.2', imageDesc: 'Legacy SL TeXLive 2014.2'}
// ]
enabledServices: (process.env.ENABLED_SERVICES || 'web,api') enabledServices: (process.env.ENABLED_SERVICES || 'web,api')
.split(',') .split(',')
.map(s => s.trim()), .map(s => s.trim()),
@ -964,3 +716,7 @@ module.exports = {
ie: '<=11', ie: '<=11',
}, },
} }
module.exports.mergeWith = function (overrides) {
return merge(overrides, module.exports)
}