aboutsummaryrefslogtreecommitdiffhomepage
path: root/config
diff options
context:
space:
mode:
authorJelle Besseling <jelle@pingiun.com>2021-08-17 08:26:20 +0200
committerGitHub <noreply@github.com>2021-08-17 08:26:20 +0200
commit0305db28c98fd6cf43a3c50ba92c76215e99d512 (patch)
tree33b753a19728d9f453c1aa4f19b36ac797e5fe80 /config
parentf88ae8f5bc223579313b28582de9101944a4a814 (diff)
downloadPeerTube-0305db28c98fd6cf43a3c50ba92c76215e99d512.tar.gz
PeerTube-0305db28c98fd6cf43a3c50ba92c76215e99d512.tar.zst
PeerTube-0305db28c98fd6cf43a3c50ba92c76215e99d512.zip
Add support for saving video files to object storage (#4290)
* Add support for saving video files to object storage * Add support for custom url generation on s3 stored files Uses two config keys to support url generation that doesn't directly go to (compatible s3). Can be used to generate urls to any cache server or CDN. * Upload files to s3 concurrently and delete originals afterwards * Only publish after move to object storage is complete * Use base url instead of url template * Fix mistyped config field * Add rudenmentary way to download before transcode * Implement Chocobozzz suggestions https://github.com/Chocobozzz/PeerTube/pull/4290#issuecomment-891670478 The remarks in question: Try to use objectStorage prefix instead of s3 prefix for your function/variables/config names Prefer to use a tree for the config: s3.streaming_playlists_bucket -> object_storage.streaming_playlists.bucket Use uppercase for config: S3.STREAMING_PLAYLISTS_BUCKETINFO.bucket -> OBJECT_STORAGE.STREAMING_PLAYLISTS.BUCKET (maybe BUCKET_NAME instead of BUCKET) I suggest to rename moveJobsRunning to pendingMovingJobs (or better, create a dedicated videoJobInfo table with a pendingMove & videoId columns so we could also use this table to track pending transcoding jobs) https://github.com/Chocobozzz/PeerTube/pull/4290/files#diff-3e26d41ca4bda1de8e1747af70ca2af642abcc1e9e0bfb94239ff2165acfbde5R19 uses a string instead of an integer I think we should store the origin object storage URL in fileUrl, without base_url injection. Instead, inject the base_url at "runtime" so admins can easily change this configuration without running a script to update DB URLs * Import correct function * Support multipart upload * Remove import of node 15.0 module stream/promises * Extend maximum upload job length Using the same value as for redundancy downloading seems logical * Use dynamic part size for really large uploads Also adds very small part size for local testing * Fix decreasePendingMove query * Resolve various PR comments * Move to object storage after optimize * Make upload size configurable and increase default * Prune webtorrent files that are stored in object storage * Move files after transcoding jobs * Fix federation * Add video path manager * Support move to external storage job in client * Fix live object storage tests Co-authored-by: Chocobozzz <me@florianbigard.com>
Diffstat (limited to 'config')
-rw-r--r--config/default.yaml33
-rw-r--r--config/production.yaml.example33
2 files changed, 66 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml
index 3d0ae6e87..3865ab5cf 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -95,6 +95,39 @@ storage:
95 # If not, peertube will fallback to the default fil 95 # If not, peertube will fallback to the default fil
96 client_overrides: 'storage/client-overrides/' 96 client_overrides: 'storage/client-overrides/'
97 97
98object_storage:
99 enabled: false
100
101 # Without protocol, will default to HTTPS
102 endpoint: '' # 's3.amazonaws.com' or 's3.fr-par.scw.cloud' for example
103
104 region: 'us-east-1'
105
106 credentials:
107 # You can also use AWS_ACCESS_KEY_ID env variable
108 access_key_id: ''
109 # You can also use AWS_SECRET_ACCESS_KEY env variable
110 secret_access_key: ''
111
112 # Maximum amount to upload in one request to object storage
113 max_upload_part: 2GB
114
115 streaming_playlists:
116 bucket_name: 'streaming-playlists'
117
118 # Allows setting all buckets to the same value but with a different prefix
119 prefix: '' # Example: 'streaming-playlists:'
120
121 # Base url for object URL generation, scheme and host will be replaced by this URL
122 # Useful when you want to use a CDN/external proxy
123 base_url: '' # Example: 'https://mirror.example.com'
124
125 # Same settings but for webtorrent videos
126 videos:
127 bucket_name: 'videos'
128 prefix: ''
129 base_url: ''
130
98log: 131log:
99 level: 'info' # 'debug' | 'info' | 'warn' | 'error' 132 level: 'info' # 'debug' | 'info' | 'warn' | 'error'
100 rotation: 133 rotation:
diff --git a/config/production.yaml.example b/config/production.yaml.example
index 514ab99a4..94238fad0 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -93,6 +93,39 @@ storage:
93 # If not, peertube will fallback to the default file 93 # If not, peertube will fallback to the default file
94 client_overrides: '/var/www/peertube/storage/client-overrides/' 94 client_overrides: '/var/www/peertube/storage/client-overrides/'
95 95
96object_storage:
97 enabled: false
98
99 # Without protocol, will default to HTTPS
100 endpoint: '' # 's3.amazonaws.com' or 's3.fr-par.scw.cloud' for example
101
102 region: 'us-east-1'
103
104 credentials:
105 # You can also use AWS_ACCESS_KEY_ID env variable
106 access_key_id: ''
107 # You can also use AWS_SECRET_ACCESS_KEY env variable
108 secret_access_key: ''
109
110 # Maximum amount to upload in one request to object storage
111 max_upload_part: 2GB
112
113 streaming_playlists:
114 bucket_name: 'streaming-playlists'
115
116 # Allows setting all buckets to the same value but with a different prefix
117 prefix: '' # Example: 'streaming-playlists:'
118
119 # Base url for object URL generation, scheme and host will be replaced by this URL
120 # Useful when you want to use a CDN/external proxy
121 base_url: '' # Example: 'https://mirror.example.com'
122
123 # Same settings but for webtorrent videos
124 videos:
125 bucket_name: 'videos'
126 prefix: ''
127 base_url: ''
128
96log: 129log:
97 level: 'info' # 'debug' | 'info' | 'warn' | 'error' 130 level: 'info' # 'debug' | 'info' | 'warn' | 'error'
98 rotation: 131 rotation: