diff options
author | Chocobozzz <me@florianbigard.com> | 2022-10-19 10:43:53 +0200 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2022-10-24 14:48:24 +0200 |
commit | 9ab330b90decf4edf152ff8e1d2948c065766b2c (patch) | |
tree | 29d924f50f7307e8e828a57ecb9ea78623487ce0 /shared/server-commands/videos | |
parent | 3545e72c686ff1725bbdfd8d16d693e2f4aa75a3 (diff) | |
download | PeerTube-9ab330b90decf4edf152ff8e1d2948c065766b2c.tar.gz PeerTube-9ab330b90decf4edf152ff8e1d2948c065766b2c.tar.zst PeerTube-9ab330b90decf4edf152ff8e1d2948c065766b2c.zip |
Use private ACL for private videos in s3
Diffstat (limited to 'shared/server-commands/videos')
-rw-r--r-- | shared/server-commands/videos/live-command.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shared/server-commands/videos/live-command.ts b/shared/server-commands/videos/live-command.ts index de193fa49..cc9502c6f 100644 --- a/shared/server-commands/videos/live-command.ts +++ b/shared/server-commands/videos/live-command.ts | |||
@@ -197,7 +197,7 @@ export class LiveCommand extends AbstractCommand { | |||
197 | 197 | ||
198 | const segmentName = `${playlistNumber}-00000${segment}.ts` | 198 | const segmentName = `${playlistNumber}-00000${segment}.ts` |
199 | const baseUrl = objectStorage | 199 | const baseUrl = objectStorage |
200 | ? ObjectStorageCommand.getPlaylistBaseUrl() + 'hls' | 200 | ? ObjectStorageCommand.getMockPlaylistBaseUrl() + 'hls' |
201 | : server.url + '/static/streaming-playlists/hls' | 201 | : server.url + '/static/streaming-playlists/hls' |
202 | 202 | ||
203 | let error = true | 203 | let error = true |
@@ -253,7 +253,7 @@ export class LiveCommand extends AbstractCommand { | |||
253 | 253 | ||
254 | const segmentName = `${playlistNumber}-00000${segment}.ts` | 254 | const segmentName = `${playlistNumber}-00000${segment}.ts` |
255 | const baseUrl = objectStorage | 255 | const baseUrl = objectStorage |
256 | ? ObjectStorageCommand.getPlaylistBaseUrl() | 256 | ? ObjectStorageCommand.getMockPlaylistBaseUrl() |
257 | : `${this.server.url}/static/streaming-playlists/hls` | 257 | : `${this.server.url}/static/streaming-playlists/hls` |
258 | 258 | ||
259 | const url = `${baseUrl}/${videoUUID}/${segmentName}` | 259 | const url = `${baseUrl}/${videoUUID}/${segmentName}` |
@@ -275,7 +275,7 @@ export class LiveCommand extends AbstractCommand { | |||
275 | const { playlistName, videoUUID, objectStorage = false } = options | 275 | const { playlistName, videoUUID, objectStorage = false } = options |
276 | 276 | ||
277 | const baseUrl = objectStorage | 277 | const baseUrl = objectStorage |
278 | ? ObjectStorageCommand.getPlaylistBaseUrl() | 278 | ? ObjectStorageCommand.getMockPlaylistBaseUrl() |
279 | : `${this.server.url}/static/streaming-playlists/hls` | 279 | : `${this.server.url}/static/streaming-playlists/hls` |
280 | 280 | ||
281 | const url = `${baseUrl}/${videoUUID}/${playlistName}` | 281 | const url = `${baseUrl}/${videoUUID}/${playlistName}` |