aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/controllers
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-01-17 21:42:47 +0100
committerChocobozzz <florian.bigard@gmail.com>2017-01-17 21:42:47 +0100
commit15103f11ec54989a0dee7fc33daa458ecb116fe4 (patch)
treeb25f8ee33f32ccd61df46afc27a2a4628f9f0be5 /server/controllers
parent1e4b0080ff1b4e802f71ec1f4cbf8cbcc70cdcbd (diff)
downloadPeerTube-15103f11ec54989a0dee7fc33daa458ecb116fe4.tar.gz
PeerTube-15103f11ec54989a0dee7fc33daa458ecb116fe4.tar.zst
PeerTube-15103f11ec54989a0dee7fc33daa458ecb116fe4.zip
Server: paths refractoring
Diffstat (limited to 'server/controllers')
-rw-r--r--server/controllers/api/pods.js3
-rw-r--r--server/controllers/client.js2
2 files changed, 3 insertions, 2 deletions
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')
5 5
6const db = require('../../initializers/database') 6const db = require('../../initializers/database')
7const logger = require('../../helpers/logger') 7const logger = require('../../helpers/logger')
8const peertubeCrypto = require('../../helpers/peertube-crypto')
8const utils = require('../../helpers/utils') 9const utils = require('../../helpers/utils')
9const friends = require('../../lib/friends') 10const friends = require('../../lib/friends')
10const middlewares = require('../../middlewares') 11const middlewares = require('../../middlewares')
@@ -67,7 +68,7 @@ function addPods (req, res, next) {
67 }, 68 },
68 69
69 function fetchMyCertificate (callback) { 70 function fetchMyCertificate (callback) {
70 friends.getMyCertificate(function (err, cert) { 71 peertubeCrypto.getMyPublicCert(function (err, cert) {
71 if (err) { 72 if (err) {
72 logger.error('Cannot read cert file.') 73 logger.error('Cannot read cert file.')
73 return callback(err) 74 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')
12const router = express.Router() 12const router = express.Router()
13 13
14const opengraphComment = '<!-- opengraph tags -->' 14const opengraphComment = '<!-- opengraph tags -->'
15const distPath = path.join(__dirname, '../../client/dist') 15const distPath = path.join(__dirname, '..', '..', 'client/dist')
16const embedPath = path.join(distPath, 'standalone/videos/embed.html') 16const embedPath = path.join(distPath, 'standalone/videos/embed.html')
17const indexPath = path.join(distPath, 'index.html') 17const indexPath = path.join(distPath, 'index.html')
18 18