Prepare embed page

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

diff --git a/server.js b/server.js
index b29fba6334881ed483d9e7ce76db6dd8a304fc75..65cf69f7db034f9a5b71e3f1440258afea031049 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')
@@ -27,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 -----------
@@ -73,18 +77,21 @@ app.use('/client/*', function (req, res, next) {
   res.sendStatus(404)
 })
 
-const torrentsPhysicalPath = path.join(__dirname, config.get('storage.torrents'))
+const torrentsPhysicalPath = 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 = 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 = 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'))
 })
@@ -140,6 +147,8 @@ installer.installApplication(function (err) {
       Request.activate()
 
       logger.info('Server listening on port %d', port)
+      logger.info('Webserver: %s', constants.CONFIG.WEBSERVER.URL)
+
       app.emit('ready')
     })
   })