diff options
| author | buoyantair <buoyantair@protonmail.com> | 2018-11-18 21:55:52 +0530 |
|---|---|---|
| committer | buoyantair <buoyantair@protonmail.com> | 2018-11-18 21:55:52 +0530 |
| commit | b9f234371bfaf0d9cfa81e02fcea92cac1f9ae13 (patch) | |
| tree | dcdf451ac431ec7953bee58e814f642d1c370d1b /config | |
| parent | 92e07c3b5d9dbf2febedb1b5b87ec676eb6d1ac8 (diff) | |
| parent | 9d0b856e930ee1c676d16a56408a3e4a18f8f978 (diff) | |
| download | PeerTube-b9f234371bfaf0d9cfa81e02fcea92cac1f9ae13.tar.gz PeerTube-b9f234371bfaf0d9cfa81e02fcea92cac1f9ae13.tar.zst PeerTube-b9f234371bfaf0d9cfa81e02fcea92cac1f9ae13.zip | |
Merge branch 'develop' of https://github.com/Chocobozzz/PeerTube into move-utils-to-shared
Diffstat (limited to 'config')
| -rw-r--r-- | config/default.yaml | 5 | ||||
| -rw-r--r-- | config/production.yaml.example | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/config/default.yaml b/config/default.yaml index 0d7d948c2..257ec7ed1 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
| @@ -58,7 +58,10 @@ log: | |||
| 58 | level: 'info' # debug/info/warning/error | 58 | level: 'info' # debug/info/warning/error |
| 59 | 59 | ||
| 60 | search: | 60 | search: |
| 61 | remote_uri: # Add ability to fetch remote videos/actors by their URI, that may not be federated with your instance | 61 | # Add ability to fetch remote videos/actors by their URI, that may not be federated with your instance |
| 62 | # If enabled, the associated group will be able to "escape" from the instance follows | ||
| 63 | # That means they will be able to follow channels, watch videos, list videos of non followed instances | ||
| 64 | remote_uri: | ||
| 62 | users: true | 65 | users: true |
| 63 | anonymous: false | 66 | anonymous: false |
| 64 | 67 | ||
diff --git a/config/production.yaml.example b/config/production.yaml.example index f9da8e0dd..ac15fc736 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example | |||
| @@ -59,7 +59,10 @@ log: | |||
| 59 | level: 'info' # debug/info/warning/error | 59 | level: 'info' # debug/info/warning/error |
| 60 | 60 | ||
| 61 | search: | 61 | search: |
| 62 | remote_uri: # Add ability to search remote videos/actors by URI, that may not be federated with your instance | 62 | # Add ability to fetch remote videos/actors by their URI, that may not be federated with your instance |
| 63 | # If enabled, the associated group will be able to "escape" from the instance follows | ||
| 64 | # That means they will be able to follow channels, watch videos, list videos of non followed instances | ||
| 65 | remote_uri: | ||
| 63 | users: true | 66 | users: true |
| 64 | anonymous: false | 67 | anonymous: false |
| 65 | 68 | ||