diff options
| author | Chocobozzz <me@florianbigard.com> | 2023-01-12 08:54:13 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2023-01-12 08:54:13 +0100 |
| commit | 3f3530c3dbc5339b4cba53710b8568b4ad39152e (patch) | |
| tree | ad919a3acc8b1bf76ae5a1a1c11c65f4683e7f06 /config | |
| parent | cdd3cef91152c72eb14427427c54be1cb63744f7 (diff) | |
| parent | 7a0bcd67735ca43d8afa50bfcd4624de383553a7 (diff) | |
| download | PeerTube-3f3530c3dbc5339b4cba53710b8568b4ad39152e.tar.gz PeerTube-3f3530c3dbc5339b4cba53710b8568b4ad39152e.tar.zst PeerTube-3f3530c3dbc5339b4cba53710b8568b4ad39152e.zip | |
Merge branch 'release/5.0.0' into develop
Diffstat (limited to 'config')
| -rw-r--r-- | config/default.yaml | 2 | ||||
| -rw-r--r-- | config/production.yaml.example | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml index d4977d003..b2c418a0a 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
| @@ -159,9 +159,11 @@ object_storage: | |||
| 159 | 159 | ||
| 160 | upload_acl: | 160 | upload_acl: |
| 161 | # Set this ACL on each uploaded object of public/unlisted videos | 161 | # Set this ACL on each uploaded object of public/unlisted videos |
| 162 | # Use null if your S3 provider does not support object ACL | ||
| 162 | public: 'public-read' | 163 | public: 'public-read' |
| 163 | # Set this ACL on each uploaded object of private/internal videos | 164 | # Set this ACL on each uploaded object of private/internal videos |
| 164 | # PeerTube can proxify requests to private objects so your users can access them | 165 | # PeerTube can proxify requests to private objects so your users can access them |
| 166 | # Use null if your S3 provider does not support object ACL | ||
| 165 | private: 'private' | 167 | private: 'private' |
| 166 | 168 | ||
| 167 | proxy: | 169 | proxy: |
diff --git a/config/production.yaml.example b/config/production.yaml.example index 17dc6839b..36fa70417 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example | |||
| @@ -157,9 +157,11 @@ object_storage: | |||
| 157 | 157 | ||
| 158 | upload_acl: | 158 | upload_acl: |
| 159 | # Set this ACL on each uploaded object of public/unlisted videos | 159 | # Set this ACL on each uploaded object of public/unlisted videos |
| 160 | # Use null if your S3 provider does not support object ACL | ||
| 160 | public: 'public-read' | 161 | public: 'public-read' |
| 161 | # Set this ACL on each uploaded object of private/internal videos | 162 | # Set this ACL on each uploaded object of private/internal videos |
| 162 | # PeerTube can proxify requests to private objects so your users can access them | 163 | # PeerTube can proxify requests to private objects so your users can access them |
| 164 | # Use null if your S3 provider does not support object ACL | ||
| 163 | private: 'private' | 165 | private: 'private' |
| 164 | 166 | ||
| 165 | proxy: | 167 | proxy: |