X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server.js;h=65cf69f7db034f9a5b71e3f1440258afea031049;hb=3bb2c7f99dd495adac8e486e98f135c183642381;hp=5feb214764f183f10cd7f8b58e5407ff3ce0a98c;hpb=aff36eb063573532498979c83be1c279c84f2d53;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server.js b/server.js
index 5feb21476..65cf69f7d 100644
--- a/server.js
+++ b/server.js
@@ -2,6 +2,7 @@
 
 // ----------- Node modules -----------
 const bodyParser = require('body-parser')
+const cors = require('cors')
 const express = require('express')
 const expressValidator = require('express-validator')
 const http = require('http')
@@ -10,11 +11,12 @@ const path = require('path')
 const TrackerServer = require('bittorrent-tracker').Server
 const WebSocketServer = require('ws').Server
 
+process.title = 'peertube'
+
 // Create our main app
 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')
@@ -24,9 +26,14 @@ database.connect()
 // ----------- Checker -----------
 const checker = require('./server/initializers/checker')
 
-const miss = checker.checkConfig()
-if (miss.length !== 0) {
-  throw new Error('Miss some configurations keys : ' + miss)
+const missed = checker.checkMissedConfig()
+if (missed.length !== 0) {
+  throw new Error('Miss some configurations keys : ' + missed)
+}
+
+const errorMessage = checker.checkConfig()
+if (errorMessage !== null) {
+  throw new Error(errorMessage)
 }
 
 // ----------- PeerTube modules -----------
@@ -37,9 +44,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 -----------
@@ -67,24 +71,27 @@ const apiRoute = '/api/' + constants.API_VERSION
 app.use(apiRoute, routes.api)
 
 // Static files
-app.use('/client', express.static(path.join(__dirname, '/client/dist'), { maxAge: 0 }))
+app.use('/client', express.static(path.join(__dirname, '/client/dist'), { maxAge: constants.STATIC_MAX_AGE }))
 // 404 for static files not found
 app.use('/client/*', function (req, res, next) {
   res.sendStatus(404)
 })
 
-const torrentsPhysicalPath = path.join(__dirname, config.get('storage.torrents'))
-app.use(constants.STATIC_PATHS.TORRENTS, express.static(torrentsPhysicalPath, { maxAge: 0 }))
+const torrentsPhysicalPath = constants.CONFIG.STORAGE.TORRENTS_DIR
+app.use(constants.STATIC_PATHS.TORRENTS, cors(), express.static(torrentsPhysicalPath, { maxAge: constants.STATIC_MAX_AGE }))
 
-// Uploads path for webseeding
-const uploadsPhysicalPath = path.join(__dirname, config.get('storage.uploads'))
-app.use(constants.STATIC_PATHS.WEBSEED, express.static(uploadsPhysicalPath, { maxAge: 0 }))
+// Videos path for webseeding
+const videosPhysicalPath = 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'))
-app.use(constants.STATIC_PATHS.THUMBNAILS, express.static(thumbnailsPhysicalPath, { maxAge: 0 }))
+const thumbnailsPhysicalPath = constants.CONFIG.STORAGE.THUMBNAILS_DIR
+app.use(constants.STATIC_PATHS.THUMBNAILS, express.static(thumbnailsPhysicalPath, { maxAge: constants.STATIC_MAX_AGE }))
 
 // Client application
+app.use('/videos/embed', function (req, res, next) {
+  res.sendFile(path.join(__dirname, 'client/dist/standalone/videos/embed.html'))
+})
 app.use('/*', function (req, res, next) {
   res.sendFile(path.join(__dirname, 'client/dist/index.html'))
 })
@@ -126,6 +133,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
 
@@ -138,8 +146,9 @@ installer.installApplication(function (err) {
       // Activate the pool requests
       Request.activate()
 
-      logger.info('Seeded all the videos')
       logger.info('Server listening on port %d', port)
+      logger.info('Webserver: %s', constants.CONFIG.WEBSERVER.URL)
+
       app.emit('ready')
     })
   })