diff options
author | Chocobozzz <me@florianbigard.com> | 2018-01-19 08:44:30 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-01-19 08:49:04 +0100 |
commit | 0edf0581a92a2c0b5423d3947934d0f36bda1592 (patch) | |
tree | 99d4c374bcc982e9fa94029cdfaf2f05fb5c74cd | |
parent | 134337bd07f2639c79bcb47ed683d1b6d55357bd (diff) | |
download | PeerTube-0edf0581a92a2c0b5423d3947934d0f36bda1592.tar.gz PeerTube-0edf0581a92a2c0b5423d3947934d0f36bda1592.tar.zst PeerTube-0edf0581a92a2c0b5423d3947934d0f36bda1592.zip |
Add http tracker in torrent too
-rwxr-xr-x | scripts/release.sh | 2 | ||||
-rw-r--r-- | server/models/video/video.ts | 3 |
2 files changed, 4 insertions, 1 deletions
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 | |||
63 | github-release release --user chocobozzz --repo peertube --tag "$version" --name "$version" | 63 | github-release release --user chocobozzz --repo peertube --tag "$version" --name "$version" |
64 | github-release upload --user chocobozzz --repo peertube --tag "$version" --name "$zip_name" --file "$zip_name" | 64 | github-release upload --user chocobozzz --repo peertube --tag "$version" --name "$zip_name" --file "$zip_name" |
65 | 65 | ||
66 | git push origin develop | ||
67 | |||
66 | # Update master branch | 68 | # Update master branch |
67 | git checkout master | 69 | git checkout master |
68 | git rebase develop | 70 | 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> { | |||
769 | createTorrentAndSetInfoHash = async function (videoFile: VideoFileModel) { | 769 | createTorrentAndSetInfoHash = async function (videoFile: VideoFileModel) { |
770 | const options = { | 770 | const options = { |
771 | announceList: [ | 771 | announceList: [ |
772 | [ CONFIG.WEBSERVER.WS + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT + '/tracker/socket' ] | 772 | [ CONFIG.WEBSERVER.WS + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT + '/tracker/socket' ], |
773 | [ CONFIG.WEBSERVER.URL + '/tracker/announce' ] | ||
773 | ], | 774 | ], |
774 | urlList: [ | 775 | urlList: [ |
775 | CONFIG.WEBSERVER.URL + STATIC_PATHS.WEBSEED + this.getVideoFilename(videoFile) | 776 | CONFIG.WEBSERVER.URL + STATIC_PATHS.WEBSEED + this.getVideoFilename(videoFile) |