From 15103f11ec54989a0dee7fc33daa458ecb116fe4 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 17 Jan 2017 21:42:47 +0100 Subject: Server: paths refractoring --- server/controllers/api/pods.js | 3 ++- server/controllers/client.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'server/controllers') diff --git a/server/controllers/api/pods.js b/server/controllers/api/pods.js index 38702face..e1fe6fb5d 100644 --- a/server/controllers/api/pods.js +++ b/server/controllers/api/pods.js @@ -5,6 +5,7 @@ const waterfall = require('async/waterfall') const db = require('../../initializers/database') const logger = require('../../helpers/logger') +const peertubeCrypto = require('../../helpers/peertube-crypto') const utils = require('../../helpers/utils') const friends = require('../../lib/friends') const middlewares = require('../../middlewares') @@ -67,7 +68,7 @@ function addPods (req, res, next) { }, function fetchMyCertificate (callback) { - friends.getMyCertificate(function (err, cert) { + peertubeCrypto.getMyPublicCert(function (err, cert) { if (err) { logger.error('Cannot read cert file.') return callback(err) diff --git a/server/controllers/client.js b/server/controllers/client.js index 8c242af07..83243a4f7 100644 --- a/server/controllers/client.js +++ b/server/controllers/client.js @@ -12,7 +12,7 @@ const db = require('../initializers/database') const router = express.Router() const opengraphComment = '' -const distPath = path.join(__dirname, '../../client/dist') +const distPath = path.join(__dirname, '..', '..', 'client/dist') const embedPath = path.join(distPath, 'standalone/videos/embed.html') const indexPath = path.join(distPath, 'index.html') -- cgit v1.2.3