diff options
Diffstat (limited to 'server/lib/friends.js')
-rw-r--r-- | server/lib/friends.js | 8 |
1 files changed, 2 insertions, 6 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') | |||
11 | 11 | ||
12 | const constants = require('../initializers/constants') | 12 | const constants = require('../initializers/constants') |
13 | const logger = require('../helpers/logger') | 13 | const logger = require('../helpers/logger') |
14 | const peertubeCrypto = require('../helpers/peertube-crypto') | ||
15 | const requests = require('../helpers/requests') | 14 | const requests = require('../helpers/requests') |
16 | 15 | ||
17 | const http = config.get('webserver.https') ? 'https' : 'http' | ||
18 | const host = config.get('webserver.host') | ||
19 | const port = config.get('webserver.port') | ||
20 | const Pod = mongoose.model('Pod') | 16 | const Pod = mongoose.model('Pod') |
21 | const Request = mongoose.model('Request') | 17 | const Request = mongoose.model('Request') |
22 | const Video = mongoose.model('Video') | 18 | const Video = mongoose.model('Video') |
@@ -45,7 +41,7 @@ function hasFriends (callback) { | |||
45 | } | 41 | } |
46 | 42 | ||
47 | function getMyCertificate (callback) { | 43 | function getMyCertificate (callback) { |
48 | fs.readFile(peertubeCrypto.getCertDir() + 'peertube.pub', 'utf8', callback) | 44 | fs.readFile(constants.CONFIG.STORAGE.CERT_DIR + 'peertube.pub', 'utf8', callback) |
49 | } | 45 | } |
50 | 46 | ||
51 | function makeFriends (callback) { | 47 | function makeFriends (callback) { |
@@ -220,7 +216,7 @@ function makeRequestsToWinningPods (cert, podsList, callback) { | |||
220 | url: pod.url + '/api/' + constants.API_VERSION + '/pods/', | 216 | url: pod.url + '/api/' + constants.API_VERSION + '/pods/', |
221 | method: 'POST', | 217 | method: 'POST', |
222 | json: { | 218 | json: { |
223 | url: http + '://' + host + ':' + port, | 219 | url: constants.CONFIG.WEBSERVER.URL, |
224 | publicKey: cert | 220 | publicKey: cert |
225 | } | 221 | } |
226 | } | 222 | } |