aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--config/production.yaml.example14
-rw-r--r--server/tests/api/object-storage/video-static-file-privacy.ts2
-rw-r--r--server/tests/api/users/users.ts2
3 files changed, 15 insertions, 3 deletions
diff --git a/config/production.yaml.example b/config/production.yaml.example
index 167d23af8..c136a73ad 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -138,6 +138,10 @@ storage:
138 # If not, peertube will fallback to the default file 138 # If not, peertube will fallback to the default file
139 client_overrides: '/var/www/peertube/storage/client-overrides/' 139 client_overrides: '/var/www/peertube/storage/client-overrides/'
140 140
141static_files:
142 # Require and check user authentication when accessing private files (internal/private video files)
143 private_files_require_auth: true
144
141object_storage: 145object_storage:
142 enabled: false 146 enabled: false
143 147
@@ -149,9 +153,17 @@ object_storage:
149 upload_acl: 153 upload_acl:
150 # Set this ACL on each uploaded object of public/unlisted videos 154 # Set this ACL on each uploaded object of public/unlisted videos
151 public: 'public-read' 155 public: 'public-read'
152 # Set this ACL on each uploaded object of private/internal videos 156 # Set this ACL on each uploaded object of private/internal videos
157 # PeerTube can proxify requests to private objects so your users can access them
153 private: 'private' 158 private: 'private'
154 159
160 proxy:
161 # If private files (private/internal video files) have a private ACL, users can't access directly the ressource
162 # PeerTube can proxify requests between your object storage service and your users
163 # If you disable PeerTube proxy, ensure you use your own proxy that is able to access the private files
164 # Or you can also set a public ACL for private files in object storage if you don't want to use a proxy
165 proxify_private_files: true
166
155 credentials: 167 credentials:
156 # You can also use AWS_ACCESS_KEY_ID env variable 168 # You can also use AWS_ACCESS_KEY_ID env variable
157 access_key_id: '' 169 access_key_id: ''
diff --git a/server/tests/api/object-storage/video-static-file-privacy.ts b/server/tests/api/object-storage/video-static-file-privacy.ts
index ed8855b3b..ea5bdd0a8 100644
--- a/server/tests/api/object-storage/video-static-file-privacy.ts
+++ b/server/tests/api/object-storage/video-static-file-privacy.ts
@@ -385,7 +385,7 @@ describe('Object storage for video static file privacy', function () {
385 }) 385 })
386 386
387 after(async function () { 387 after(async function () {
388 this.timeout(60000) 388 this.timeout(240000)
389 389
390 const { data } = await server.videos.listAllForAdmin() 390 const { data } = await server.videos.listAllForAdmin()
391 391
diff --git a/server/tests/api/users/users.ts b/server/tests/api/users/users.ts
index 9e657b387..3952a7aed 100644
--- a/server/tests/api/users/users.ts
+++ b/server/tests/api/users/users.ts
@@ -181,7 +181,7 @@ describe('Test users', function () {
181 }) 181 })
182 182
183 it('Should refresh the token', async function () { 183 it('Should refresh the token', async function () {
184 this.timeout(15000) 184 this.timeout(50000)
185 185
186 const futureDate = new Date(new Date().getTime() + 1000 * 60).toISOString() 186 const futureDate = new Date(new Date().getTime() + 1000 * 60).toISOString()
187 await server.sql.setTokenField(server.accessToken, 'refreshTokenExpiresAt', futureDate) 187 await server.sql.setTokenField(server.accessToken, 'refreshTokenExpiresAt', futureDate)