aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rwxr-xr-xscripts/release.sh2
-rw-r--r--server/models/video/video.ts3
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
63github-release release --user chocobozzz --repo peertube --tag "$version" --name "$version" 63github-release release --user chocobozzz --repo peertube --tag "$version" --name "$version"
64github-release upload --user chocobozzz --repo peertube --tag "$version" --name "$zip_name" --file "$zip_name" 64github-release upload --user chocobozzz --repo peertube --tag "$version" --name "$zip_name" --file "$zip_name"
65 65
66git push origin develop
67
66# Update master branch 68# Update master branch
67git checkout master 69git checkout master
68git rebase develop 70git 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)