From 619b445a77436e34326180e3b528a619ee71bbbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 29 Dec 2023 11:48:33 +0100 Subject: [PATCH 1/3] Update production.yaml --- conf/production.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/production.yaml b/conf/production.yaml index dd6bee1..6c086b7 100644 --- a/conf/production.yaml +++ b/conf/production.yaml @@ -138,10 +138,10 @@ defaults: # From the project root directory storage: tmp: '__DATA_DIR__/storage/tmp/' # Use to download data (imports etc), store uploaded files before processing... - tmp_persistent: '__DATA_DIR__//storage/tmp-persistent/' # As tmp but the directory is not cleaned up between PeerTube restarts + tmp_persistent: '__DATA_DIR__/storage/tmp-persistent/' # As tmp but the directory is not cleaned up between PeerTube restarts bin: '__DATA_DIR__/storage/bin/' avatars: '__DATA_DIR__/storage/avatars/' - web_videos: '__DATA_DIR__/storage/videos/' + web_videos: '__DATA_DIR__/storage/web_videos/' streaming_playlists: '__DATA_DIR__/storage/streaming-playlists/' redundancy: '__DATA_DIR__/storage/redundancy/' logs: '/var/log/__APP__/' From c103567428840888e3b8feec0f7fad0f2af2403f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 29 Dec 2023 13:07:46 +0100 Subject: [PATCH 2/3] Update nginx.conf --- conf/nginx.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 97a1549..99f1398 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -168,7 +168,7 @@ location ~ ^/static/(thumbnails|avatars)/ { try_files $uri @api; } -location ~ ^(/static/(webseed|web-videos|streaming-playlists)/private/)|^/download { +location ~ ^(/static/(webseed|videos|streaming-playlists)/private/)|^/download { # We can't rate limit a try_files directive, so we need to duplicate @api proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -181,7 +181,7 @@ location ~ ^(/static/(webseed|web-videos|streaming-playlists)/private/)|^/downlo } # Bypass PeerTube for performance reasons. Optional. -location ~ ^/static/(webseed|web-videos|redundancy|streaming-playlists)/ { +location ~ ^/static/(webseed|videos|redundancy|streaming-playlists)/ { limit_rate_after 5M; set $peertube_limit_rate 5M; From ee9d94eca8af7cb0679ef8f33c6d90e7f5d8487d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 29 Dec 2023 13:50:10 +0100 Subject: [PATCH 3/3] Update production.yaml --- conf/production.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/production.yaml b/conf/production.yaml index 6c086b7..74ab8ce 100644 --- a/conf/production.yaml +++ b/conf/production.yaml @@ -141,7 +141,7 @@ storage: tmp_persistent: '__DATA_DIR__/storage/tmp-persistent/' # As tmp but the directory is not cleaned up between PeerTube restarts bin: '__DATA_DIR__/storage/bin/' avatars: '__DATA_DIR__/storage/avatars/' - web_videos: '__DATA_DIR__/storage/web_videos/' + web_videos: '__DATA_DIR__/storage/videos/' streaming_playlists: '__DATA_DIR__/storage/streaming-playlists/' redundancy: '__DATA_DIR__/storage/redundancy/' logs: '/var/log/__APP__/' @@ -212,7 +212,7 @@ object_storage: # Same settings but for web videos web_videos: - bucket_name: 'web-videos' + bucket_name: 'videos' prefix: '' base_url: ''