Server: use constants for static paths too

[github/Chocobozzz/PeerTube.git] / server.js

diff --git a/server.js b/server.js
index 28ad4fc0893055d70610ced6d17ec93106bd1203..e5bb5d1a4478f1b750950c1d8e09651a5e1f5df6 100644 (file)
--- 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')
@@ -40,9 +39,6 @@ const mongoose = require('mongoose')
 const routes = require('./server/controllers')
 const Request = mongoose.model('Request')
 
-// Get configurations
-const port = config.get('listen.port')
-
 // ----------- Command line -----------
 
 // ----------- App -----------
@@ -76,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
@@ -129,6 +125,7 @@ app.use(function (err, req, res, next) {
   res.sendStatus(err.status || 500)
 })
 
+const port = constants.CONFIG.LISTEN.PORT
 installer.installApplication(function (err) {
   if (err) throw err