Server: put config in constants

2 files changed, 6 insertions, 11 deletions

diff --git a/server/lib/friends.js b/server/lib/friends.js
index 6e1516b94..6a2c37fd7 100644
--- a/server/lib/friends.js
+++ b/server/lib/friends.js
@@ -11,12 +11,8 @@ const waterfall = require('async/waterfall')
 
 const constants = require('../initializers/constants')
 const logger = require('../helpers/logger')
-const peertubeCrypto = require('../helpers/peertube-crypto')
 const requests = require('../helpers/requests')
 
-const http = config.get('webserver.https') ? 'https' : 'http'
-const host = config.get('webserver.host')
-const port = config.get('webserver.port')
 const Pod = mongoose.model('Pod')
 const Request = mongoose.model('Request')
 const Video = mongoose.model('Video')
@@ -45,7 +41,7 @@ function hasFriends (callback) {
 }
 
 function getMyCertificate (callback) {
-  fs.readFile(peertubeCrypto.getCertDir() + 'peertube.pub', 'utf8', callback)
+  fs.readFile(constants.CONFIG.STORAGE.CERT_DIR + 'peertube.pub', 'utf8', callback)
 }
 
 function makeFriends (callback) {
@@ -220,7 +216,7 @@ function makeRequestsToWinningPods (cert, podsList, callback) {
       url: pod.url + '/api/' + constants.API_VERSION + '/pods/',
       method: 'POST',
       json: {
-        url: http + '://' + host + ':' + port,
+        url: constants.CONFIG.WEBSERVER.URL,
         publicKey: cert
       }
     }
diff --git a/server/lib/webtorrent.js b/server/lib/webtorrent.js
index bcd30139e..2090b792b 100644
--- a/server/lib/webtorrent.js
+++ b/server/lib/webtorrent.js
@@ -1,15 +1,14 @@
 'use strict'
 
-const config = require('config')
 const ipc = require('node-ipc')
 const pathUtils = require('path')
 const spawn = require('electron-spawn')
 
+const constants = require('../initializers/constants')
 const logger = require('../helpers/logger')
 
-const electronDebug = config.get('electron.debug')
-let host = config.get('webserver.host')
-let port = config.get('webserver.port')
+let host = constants.CONFIG.WEBSERVER.HOST
+let port = constants.CONFIG.WEBSERVER.PORT
 let nodeKey = 'webtorrentnode' + port
 let processKey = 'webtorrentprocess' + port
 ipc.config.silent = true
@@ -59,7 +58,7 @@ function create (options, callback) {
 
     const webtorrentProcess = spawn(pathUtils.join(__dirname, 'webtorrent-process.js'), host, port, { detached: true })
 
-    if (electronDebug === true) {
+    if (constants.CONFIG.ELECTRON.DEBUG === true) {
       webtorrentProcess.stderr.on('data', function (data) {
         logger.debug('Webtorrent process stderr: ', data.toString())
       })