diff --git a/services/web/app/views/project/editor/meta.pug b/services/web/app/views/project/editor/meta.pug index adea1a38a0..68d14e5c10 100644 --- a/services/web/app/views/project/editor/meta.pug +++ b/services/web/app/views/project/editor/meta.pug @@ -9,7 +9,7 @@ meta(name="ol-anonymousAccessToken" content=anonymousAccessToken) meta(name="ol-isTokenMember" data-type="boolean" content=isTokenMember) meta(name="ol-isRestrictedTokenMember" data-type="boolean" content=isRestrictedTokenMember) meta(name="ol-maxDocLength" data-type="json" content=maxDocLength) -meta(name="ol-wikiEnabled" data-type="boolean" content=!!(settings.apis.wiki && settings.apis.wiki.url)) +meta(name="ol-wikiEnabled" data-type="boolean" content=settings.proxyLearn) meta(name="ol-gitBridgePublicBaseUrl" content=gitBridgePublicBaseUrl) meta(name="ol-compilesUserContentDomain" content=settings.compilesUserContentDomain) meta(name="ol-fallbackCompileDomain" content=settings.pdfDownloadDomain) diff --git a/services/web/config/settings.defaults.js b/services/web/config/settings.defaults.js index 74192b588c..ed8ab31729 100644 --- a/services/web/config/settings.defaults.js +++ b/services/web/config/settings.defaults.js @@ -218,6 +218,10 @@ module.exports = { webpack: { url: `http://${process.env.WEBPACK_HOST || 'localhost'}:3808`, }, + wiki: { + url: process.env.WIKI_URL || 'https://learn.sharelatex.com', + maxCacheAge: parseInt(process.env.WIKI_MAX_CACHE_AGE || 5 * minutes, 10), + }, haveIBeenPwned: { enabled: process.env.HAVE_I_BEEN_PWNED_ENABLED === 'true', diff --git a/services/web/test/acceptance/config/settings.test.server-pro.js b/services/web/test/acceptance/config/settings.test.server-pro.js index f0424656c8..69a7a16355 100644 --- a/services/web/test/acceptance/config/settings.test.server-pro.js +++ b/services/web/test/acceptance/config/settings.test.server-pro.js @@ -2,7 +2,11 @@ const { merge } = require('@overleaf/settings/merge') const baseApp = require('../../../config/settings.overrides.server-pro') const baseTest = require('./settings.test.defaults') -module.exports = baseApp.mergeWith(baseTest.mergeWith({})) +module.exports = baseApp.mergeWith( + baseTest.mergeWith({ + proxyLearn: true, + }) +) module.exports.mergeWith = function (overrides) { return merge(overrides, module.exports)