From a2647f7ac6caf1cb93483a1bad54c648b630c2ee Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 1 Nov 2016 19:22:39 +0100 Subject: [PATCH] Server: use constants for static paths too --- server.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/server.js b/server.js index b29fba633..e5bb5d1a4 100644 --- a/server.js +++ b/server.js @@ -17,7 +17,6 @@ process.title = 'peertube' const app = express() // ----------- Database ----------- -const config = require('config') const constants = require('./server/initializers/constants') const database = require('./server/initializers/database') const logger = require('./server/helpers/logger') @@ -73,15 +72,15 @@ app.use('/client/*', function (req, res, next) { res.sendStatus(404) }) -const torrentsPhysicalPath = path.join(__dirname, config.get('storage.torrents')) +const torrentsPhysicalPath = path.join(__dirname, constants.CONFIG.STORAGE.TORRENTS_DIR) app.use(constants.STATIC_PATHS.TORRENTS, cors(), express.static(torrentsPhysicalPath, { maxAge: constants.STATIC_MAX_AGE })) // Videos path for webseeding -const videosPhysicalPath = path.join(__dirname, config.get('storage.videos')) +const videosPhysicalPath = path.join(__dirname, constants.CONFIG.STORAGE.VIDEOS_DIR) app.use(constants.STATIC_PATHS.WEBSEED, cors(), express.static(videosPhysicalPath, { maxAge: constants.STATIC_MAX_AGE })) // Thumbnails path for express -const thumbnailsPhysicalPath = path.join(__dirname, config.get('storage.thumbnails')) +const thumbnailsPhysicalPath = path.join(__dirname, constants.CONFIG.STORAGE.THUMBNAILS_DIR) app.use(constants.STATIC_PATHS.THUMBNAILS, express.static(thumbnailsPhysicalPath, { maxAge: constants.STATIC_MAX_AGE })) // Client application -- 2.41.0