aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--server.js2
-rw-r--r--server/helpers/custom-validators.js (renamed from server/helpers/customValidators.js)0
-rw-r--r--server/helpers/peertube-crypto.js (renamed from server/helpers/peertubeCrypto.js)0
-rw-r--r--server/helpers/requests.js2
-rw-r--r--server/initializers/installer.js2
-rw-r--r--server/lib/friends.js2
-rw-r--r--server/lib/webtorrent-process.js (renamed from server/lib/webtorrentProcess.js)0
-rw-r--r--server/lib/webtorrent.js2
-rw-r--r--server/middlewares/secure.js2
-rw-r--r--server/middlewares/validators/videos.js2
-rw-r--r--server/models/video.js2
11 files changed, 8 insertions, 8 deletions
diff --git a/server.js b/server.js
index e0284b080..b2eeeff70 100644
--- a/server.js
+++ b/server.js
@@ -30,7 +30,7 @@ if (miss.length !== 0) {
30} 30}
31 31
32// ----------- PeerTube modules ----------- 32// ----------- PeerTube modules -----------
33const customValidators = require('./server/helpers/customValidators') 33const customValidators = require('./server/helpers/custom-validators')
34const installer = require('./server/initializers/installer') 34const installer = require('./server/initializers/installer')
35const mongoose = require('mongoose') 35const mongoose = require('mongoose')
36const routes = require('./server/controllers') 36const routes = require('./server/controllers')
diff --git a/server/helpers/customValidators.js b/server/helpers/custom-validators.js
index b666644c0..b666644c0 100644
--- a/server/helpers/customValidators.js
+++ b/server/helpers/custom-validators.js
diff --git a/server/helpers/peertubeCrypto.js b/server/helpers/peertube-crypto.js
index 46dff8d03..46dff8d03 100644
--- a/server/helpers/peertubeCrypto.js
+++ b/server/helpers/peertube-crypto.js
diff --git a/server/helpers/requests.js b/server/helpers/requests.js
index 871342d60..547230adc 100644
--- a/server/helpers/requests.js
+++ b/server/helpers/requests.js
@@ -5,7 +5,7 @@ const replay = require('request-replay')
5const request = require('request') 5const request = require('request')
6 6
7const constants = require('../initializers/constants') 7const constants = require('../initializers/constants')
8const peertubeCrypto = require('./peertubeCrypto') 8const peertubeCrypto = require('./peertube-crypto')
9 9
10const http = config.get('webserver.https') ? 'https' : 'http' 10const http = config.get('webserver.https') ? 'https' : 'http'
11const host = config.get('webserver.host') 11const host = config.get('webserver.host')
diff --git a/server/initializers/installer.js b/server/initializers/installer.js
index e0ae822cf..014efbcb7 100644
--- a/server/initializers/installer.js
+++ b/server/initializers/installer.js
@@ -9,7 +9,7 @@ const path = require('path')
9 9
10const checker = require('./checker') 10const checker = require('./checker')
11const logger = require('../helpers/logger') 11const logger = require('../helpers/logger')
12const peertubeCrypto = require('../helpers/peertubeCrypto') 12const peertubeCrypto = require('../helpers/peertube-crypto')
13 13
14const Client = mongoose.model('OAuthClient') 14const Client = mongoose.model('OAuthClient')
15const User = mongoose.model('User') 15const User = mongoose.model('User')
diff --git a/server/lib/friends.js b/server/lib/friends.js
index a93467c13..a85f4e19a 100644
--- a/server/lib/friends.js
+++ b/server/lib/friends.js
@@ -8,7 +8,7 @@ const request = require('request')
8 8
9const constants = require('../initializers/constants') 9const constants = require('../initializers/constants')
10const logger = require('../helpers/logger') 10const logger = require('../helpers/logger')
11const peertubeCrypto = require('../helpers/peertubeCrypto') 11const peertubeCrypto = require('../helpers/peertube-crypto')
12const requests = require('../helpers/requests') 12const requests = require('../helpers/requests')
13 13
14const http = config.get('webserver.https') ? 'https' : 'http' 14const http = config.get('webserver.https') ? 'https' : 'http'
diff --git a/server/lib/webtorrentProcess.js b/server/lib/webtorrent-process.js
index be7ac5bb4..be7ac5bb4 100644
--- a/server/lib/webtorrentProcess.js
+++ b/server/lib/webtorrent-process.js
diff --git a/server/lib/webtorrent.js b/server/lib/webtorrent.js
index fe2ee357f..9960737f2 100644
--- a/server/lib/webtorrent.js
+++ b/server/lib/webtorrent.js
@@ -57,7 +57,7 @@ function create (options, callback) {
57 throw new Error('Received exception error from webtorrent process : ' + data.exception) 57 throw new Error('Received exception error from webtorrent process : ' + data.exception)
58 }) 58 })
59 59
60 const webtorrentProcess = spawn(pathUtils.join(__dirname, 'webtorrentProcess.js'), host, port, { detached: true }) 60 const webtorrentProcess = spawn(pathUtils.join(__dirname, 'webtorrent-process.js'), host, port, { detached: true })
61 61
62 if (electronDebug === true) { 62 if (electronDebug === true) {
63 webtorrentProcess.stderr.on('data', function (data) { 63 webtorrentProcess.stderr.on('data', function (data) {
diff --git a/server/middlewares/secure.js b/server/middlewares/secure.js
index fbaf4d0f2..9779c14ac 100644
--- a/server/middlewares/secure.js
+++ b/server/middlewares/secure.js
@@ -2,7 +2,7 @@
2 2
3const logger = require('../helpers/logger') 3const logger = require('../helpers/logger')
4const mongoose = require('mongoose') 4const mongoose = require('mongoose')
5const peertubeCrypto = require('../helpers/peertubeCrypto') 5const peertubeCrypto = require('../helpers/peertube-crypto')
6 6
7const Pod = mongoose.model('Pod') 7const Pod = mongoose.model('Pod')
8 8
diff --git a/server/middlewares/validators/videos.js b/server/middlewares/validators/videos.js
index 24e2299dc..3e2af06fb 100644
--- a/server/middlewares/validators/videos.js
+++ b/server/middlewares/validators/videos.js
@@ -4,7 +4,7 @@ const mongoose = require('mongoose')
4 4
5const checkErrors = require('./utils').checkErrors 5const checkErrors = require('./utils').checkErrors
6const constants = require('../../initializers/constants') 6const constants = require('../../initializers/constants')
7const customValidators = require('../../helpers/customValidators') 7const customValidators = require('../../helpers/custom-validators')
8const logger = require('../../helpers/logger') 8const logger = require('../../helpers/logger')
9 9
10const Video = mongoose.model('Video') 10const Video = mongoose.model('Video')
diff --git a/server/models/video.js b/server/models/video.js
index a8a70ba89..1c06e477c 100644
--- a/server/models/video.js
+++ b/server/models/video.js
@@ -8,7 +8,7 @@ const pathUtils = require('path')
8const mongoose = require('mongoose') 8const mongoose = require('mongoose')
9 9
10const constants = require('../initializers/constants') 10const constants = require('../initializers/constants')
11const customValidators = require('../helpers/customValidators') 11const customValidators = require('../helpers/custom-validators')
12const logger = require('../helpers/logger') 12const logger = require('../helpers/logger')
13const utils = require('../helpers/utils') 13const utils = require('../helpers/utils')
14const webtorrent = require('../lib/webtorrent') 14const webtorrent = require('../lib/webtorrent')