From: Chocobozzz <florian.bigard@gmail.com>
Date: Tue, 1 Nov 2016 18:22:39 +0000 (+0100)
Subject: Server: use constants for static paths too
X-Git-Tag: v0.0.1-alpha~650
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=a2647f7ac6caf1cb93483a1bad54c648b630c2ee;hp=d16b5172ae95f2389084ba2a301088358605771f;p=github%2FChocobozzz%2FPeerTube.git

Server: use constants for static paths too
---

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