2 files changed, 11 insertions, 7 deletions

diff --git a/server/initializers/constants.js b/server/initializers/constants.js
index 09c4f755e..fb1cbc5f3 100644
--- a/server/initializers/constants.js
+++ b/server/initializers/constants.js
@@ -44,6 +44,7 @@ const CONFIG = {
   },
   WEBSERVER: {
     SCHEME: config.get('webserver.https') === true ? 'https' : 'http',
+    WS: config.get('webserver.https') === true ? 'wss' : 'ws',
     HOST: config.get('webserver.host'),
     PORT: config.get('webserver.port')
   }
diff --git a/server/models/video.js b/server/models/video.js
index 9272bea6d..4b941a40c 100644
--- a/server/models/video.js
+++ b/server/models/video.js
@@ -1,6 +1,5 @@
 'use strict'
 
-const config = require('config')
 const createTorrent = require('create-torrent')
 const ffmpeg = require('fluent-ffmpeg')
 const fs = require('fs')
@@ -16,11 +15,6 @@ const logger = require('../helpers/logger')
 const modelUtils = require('./utils')
 const utils = require('../helpers/utils')
 
-const http = config.get('webserver.https') === true ? 'https' : 'http'
-const host = config.get('webserver.host')
-const port = config.get('webserver.port')
-const webseedBaseUrl = http + '://' + host + ':' + port + constants.STATIC_PATHS.WEBSEED
-
 // ---------------------------------------------------------------------------
 
 // TODO: add indexes on searchable columns
@@ -106,7 +100,16 @@ VideoSchema.pre('save', function (next) {
     tasks.push(
       // TODO: refractoring
       function (callback) {
-        createTorrent(videoPath, { announceList: [ [ 'ws://' + host + ':' + port + '/tracker/socket' ] ], urlList: [ webseedBaseUrl + video.filename ] }, function (err, torrent) {
+        const options = {
+          announceList: [
+            [ constants.CONFIG.WEBSERVER.WS + '://' + constants.CONFIG.WEBSERVER.HOST + ':' + constants.CONFIG.WEBSERVER.PORT + '/tracker/socket' ]
+          ],
+          urlList: [
+            constants.CONFIG.WEBSERVER.URL + constants.STATIC_PATHS.WEBSEED + video.filename
+          ]
+        }
+
+        createTorrent(videoPath, options, function (err, torrent) {
           if (err) return callback(err)
 
           fs.writeFile(constants.CONFIG.STORAGE.TORRENTS_DIR + video.filename + '.torrent', torrent, function (err) {