Server: use constants for static paths too

pull/24/head
Chocobozzz 2016-11-01 19:22:39 +01:00
parent d16b5172ae
commit a2647f7ac6
1 changed files with 3 additions and 4 deletions

View File

@ -17,7 +17,6 @@ process.title = 'peertube'
const app = express() const app = express()
// ----------- Database ----------- // ----------- Database -----------
const config = require('config')
const constants = require('./server/initializers/constants') const constants = require('./server/initializers/constants')
const database = require('./server/initializers/database') const database = require('./server/initializers/database')
const logger = require('./server/helpers/logger') const logger = require('./server/helpers/logger')
@ -73,15 +72,15 @@ app.use('/client/*', function (req, res, next) {
res.sendStatus(404) 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 })) app.use(constants.STATIC_PATHS.TORRENTS, cors(), express.static(torrentsPhysicalPath, { maxAge: constants.STATIC_MAX_AGE }))
// Videos path for webseeding // 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 })) app.use(constants.STATIC_PATHS.WEBSEED, cors(), express.static(videosPhysicalPath, { maxAge: constants.STATIC_MAX_AGE }))
// Thumbnails path for express // 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 })) app.use(constants.STATIC_PATHS.THUMBNAILS, express.static(thumbnailsPhysicalPath, { maxAge: constants.STATIC_MAX_AGE }))
// Client application // Client application