borekon/PeerTube_original
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge d0086e1636 into cf843c3f12

Browse Source
This commit is contained in:
Rin Cat (鈴猫) 2023-12-07 09:18:09 +01:00 committed by GitHub
commit 7b8fcf0fa2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/default.yaml
View File

@ -227,6 +227,9 @@ object_storage:
prefix: ''
base_url: ''
cdn:
web_videos_base_url: ''
log:
level: 'info' # 'debug' | 'info' | 'warn' | 'error'

3
config/production.yaml.example
View File

@ -225,6 +225,9 @@ object_storage:
prefix: ''
base_url: ''
cdn:
web_videos_base_url: '' # Example: 'https://mirror.example.com'
log:
level: 'info' # 'debug' | 'info' | 'warn' | 'error'

1
server/core/initializers/checker-before-init.ts
View File

@ -65,6 +65,7 @@ function checkMissedConfig () {
'object_storage.credentials.secret_access_key', 'object_storage.max_upload_part', 'object_storage.streaming_playlists.bucket_name',
'object_storage.streaming_playlists.prefix', 'object_storage.streaming_playlists.base_url', 'object_storage.web_videos.bucket_name',
'object_storage.web_videos.prefix', 'object_storage.web_videos.base_url',
'cdn.web_videos_base_url',
'theme.default',
'feeds.videos.count', 'feeds.comments.count',
'geo_ip.enabled', 'geo_ip.country.database_url',

3
server/core/initializers/config.ts
View File

@ -155,6 +155,9 @@ const CONFIG = {
BASE_URL: config.get<string>('object_storage.streaming_playlists.base_url')
}
},
CDN: {
WEB_VIDEOS_BASE_URL: config.get<string>('cdn.web_videos_base_url')
},
WEBSERVER: {
SCHEME: config.get<boolean>('webserver.https') === true ? 'https' : 'http',
WS: config.get<boolean>('webserver.https') === true ? 'wss' : 'ws',

9
server/core/models/video/video-file.ts
View File

@ -540,6 +540,8 @@ export class VideoFileModel extends Model<Partial<AttributesOnly<VideoFileModel>
if (video.isOwned()) {
if (this.storage === VideoStorage.OBJECT_STORAGE) {
return this.getObjectStorageUrl(video)
} else if (CONFIG.CDN.WEB_VIDEOS_BASE_URL) {
return CONFIG.CDN.WEB_VIDEOS_BASE_URL + this.getFileStaticPath(video)
}
return WEBSERVER.URL + this.getFileStaticPath(video)
@ -579,7 +581,12 @@ export class VideoFileModel extends Model<Partial<AttributesOnly<VideoFileModel>
? join(STATIC_DOWNLOAD_PATHS.HLS_VIDEOS, `${video.uuid}-${this.resolution}-fragmented${this.extname}`)
: join(STATIC_DOWNLOAD_PATHS.VIDEOS, `${video.uuid}-${this.resolution}${this.extname}`)
if (video.isOwned()) return WEBSERVER.URL + path
if (video.isOwned()) {
if (CONFIG.CDN.WEB_VIDEOS_BASE_URL) {
return CONFIG.CDN.WEB_VIDEOS_BASE_URL + path
}
return WEBSERVER.URL + path
}
// FIXME: don't guess remote URL
return buildRemoteVideoBaseUrl(video, path)

4
server/core/models/video/video-streaming-playlist.ts
View File

@ -256,6 +256,8 @@ export class VideoStreamingPlaylistModel extends Model<Partial<AttributesOnly<Vi
if (video.isOwned()) {
if (this.storage === VideoStorage.OBJECT_STORAGE) {
return this.getMasterPlaylistObjectStorageUrl(video)
} else if (CONFIG.CDN.WEB_VIDEOS_BASE_URL) {
return CONFIG.CDN.WEB_VIDEOS_BASE_URL + this.getMasterPlaylistStaticPath(video)
}
return WEBSERVER.URL + this.getMasterPlaylistStaticPath(video)
@ -278,6 +280,8 @@ export class VideoStreamingPlaylistModel extends Model<Partial<AttributesOnly<Vi
if (video.isOwned()) {
if (this.storage === VideoStorage.OBJECT_STORAGE) {
return this.getSha256SegmentsObjectStorageUrl(video)
} else if (CONFIG.CDN.WEB_VIDEOS_BASE_URL) {
return CONFIG.CDN.WEB_VIDEOS_BASE_URL + this.getSha256SegmentsStaticPath(video)
}
return WEBSERVER.URL + this.getSha256SegmentsStaticPath(video)