From: Chocobozzz <me@florianbigard.com>
Date: Fri, 19 Jan 2018 07:44:30 +0000 (+0100)
Subject: Add http tracker in torrent too
X-Git-Tag: v0.0.14-alpha~14
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=0edf0581a92a2c0b5423d3947934d0f36bda1592;p=github%2FChocobozzz%2FPeerTube.git

Add http tracker in torrent too
---

diff --git a/scripts/release.sh b/scripts/release.sh
index 0285f4638..0e288a49c 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -63,6 +63,8 @@ git push origin --tag
 github-release release --user chocobozzz --repo peertube --tag "$version" --name "$version"
 github-release upload --user chocobozzz --repo peertube --tag "$version" --name "$zip_name" --file "$zip_name"
 
+git push origin develop
+
 # Update master branch
 git checkout master
 git rebase develop
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index d22d57310..77c0400d8 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -769,7 +769,8 @@ export class VideoModel extends Model<VideoModel> {
   createTorrentAndSetInfoHash = async function (videoFile: VideoFileModel) {
     const options = {
       announceList: [
-        [ CONFIG.WEBSERVER.WS + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT + '/tracker/socket' ]
+        [ CONFIG.WEBSERVER.WS + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT + '/tracker/socket' ],
+        [ CONFIG.WEBSERVER.URL + '/tracker/announce' ]
       ],
       urlList: [
         CONFIG.WEBSERVER.URL + STATIC_PATHS.WEBSEED + this.getVideoFilename(videoFile)