From 95355b8f0148db38ce89bb5e9b2c4b38a45c9619 Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Tue, 25 Feb 2020 11:19:39 +0100 Subject: [PATCH] Fix broken assets Since switching to TypeScript our assets are broken due to the move of app.js to the `./lib` subdirectory and the relative patch specified for the public directory. This patch solves the problem by adding a proper config element for the path and referencing it in `./lib/app.js`. Signed-off-by: Sheogorath --- lib/app.js | 2 +- lib/config/default.js | 1 + lib/config/index.js | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/app.js b/lib/app.js index dadc699e3..544d63758 100644 --- a/lib/app.js +++ b/lib/app.js @@ -126,7 +126,7 @@ app.use(i18n.init) // routes without sessions // static files -app.use('/', express.static(path.join(__dirname, '/public'), { maxAge: config.staticCacheTime, index: false, redirect: false })) +app.use('/', express.static(path.resolve(__dirname, config.publicPath), { maxAge: config.staticCacheTime, index: false, redirect: false })) app.use('/docs', express.static(path.resolve(__dirname, config.docsPath), { maxAge: config.staticCacheTime, redirect: false })) app.use('/uploads', express.static(path.resolve(__dirname, config.uploadsPath), { maxAge: config.staticCacheTime, redirect: false })) app.use('/default.md', express.static(path.resolve(__dirname, config.defaultNotePath), { maxAge: config.staticCacheTime })) diff --git a/lib/config/default.js b/lib/config/default.js index 7504fda28..f47fe344d 100644 --- a/lib/config/default.js +++ b/lib/config/default.js @@ -42,6 +42,7 @@ module.exports = { sslCAPath: '', dhParamPath: '', // other path + publicPath: './public', viewPath: './public/views', tmpPath: os.tmpdir(), defaultNotePath: './public/default.md', diff --git a/lib/config/index.js b/lib/config/index.js index ee4817b37..c542516d6 100644 --- a/lib/config/index.js +++ b/lib/config/index.js @@ -205,6 +205,7 @@ config.sslKeyPath = path.resolve(appRootPath, config.sslKeyPath) config.dhParamPath = path.resolve(appRootPath, config.dhParamPath) config.viewPath = path.resolve(appRootPath, config.viewPath) config.tmpPath = path.resolve(appRootPath, config.tmpPath) +config.publicPath = path.resolve(appRootPath, config.publicPath) config.defaultNotePath = path.resolve(appRootPath, config.defaultNotePath) config.docsPath = path.resolve(appRootPath, config.docsPath) config.uploadsPath = path.resolve(appRootPath, config.uploadsPath)