diff options
author | Chocobozzz <me@florianbigard.com> | 2019-08-29 16:21:19 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-08-29 16:21:19 +0200 |
commit | aafbc63aae65a09d1de808995617bacdbb813191 (patch) | |
tree | 19d51e134d9c6fc90ce3bbc0b39afa6d51ccbac8 | |
parent | ad513607a3886cfabe083531c42911bc3c67bdfb (diff) | |
download | PeerTube-aafbc63aae65a09d1de808995617bacdbb813191.tar.gz PeerTube-aafbc63aae65a09d1de808995617bacdbb813191.tar.zst PeerTube-aafbc63aae65a09d1de808995617bacdbb813191.zip |
Consistency between default.yaml and production.yaml
-rw-r--r-- | config/default.yaml | 4 | ||||
-rw-r--r-- | config/production.yaml.example | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/config/default.yaml b/config/default.yaml index dfba23f59..b8ba7006a 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
@@ -69,7 +69,7 @@ email: | |||
69 | 69 | ||
70 | # From the project root directory | 70 | # From the project root directory |
71 | storage: | 71 | storage: |
72 | tmp: 'storage/tmp/' # Used to download data (imports etc), store uploaded files before processing... | 72 | tmp: 'storage/tmp/' # Use to download data (imports etc), store uploaded files before processing... |
73 | avatars: 'storage/avatars/' | 73 | avatars: 'storage/avatars/' |
74 | videos: 'storage/videos/' | 74 | videos: 'storage/videos/' |
75 | streaming_playlists: 'storage/streaming-playlists/' | 75 | streaming_playlists: 'storage/streaming-playlists/' |
@@ -85,7 +85,7 @@ storage: | |||
85 | log: | 85 | log: |
86 | level: 'info' # debug/info/warning/error | 86 | level: 'info' # debug/info/warning/error |
87 | rotation: | 87 | rotation: |
88 | enabled : true # Enabled by default, if disabled make sure that 'storage.logs' is pointing to a folder handled by logrotate | 88 | enabled : true |
89 | 89 | ||
90 | search: | 90 | search: |
91 | # Add ability to fetch remote videos/actors by their URI, that may not be federated with your instance | 91 | # Add ability to fetch remote videos/actors by their URI, that may not be federated with your instance |
diff --git a/config/production.yaml.example b/config/production.yaml.example index 267186e08..2dec5ef0c 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example | |||
@@ -70,11 +70,11 @@ email: | |||
70 | 70 | ||
71 | # From the project root directory | 71 | # From the project root directory |
72 | storage: | 72 | storage: |
73 | tmp: '/var/www/peertube/storage/tmp/' # Used to download data (imports etc), store uploaded files before processing... | 73 | tmp: '/var/www/peertube/storage/tmp/' # Use to download data (imports etc), store uploaded files before processing... |
74 | avatars: '/var/www/peertube/storage/avatars/' | 74 | avatars: '/var/www/peertube/storage/avatars/' |
75 | videos: '/var/www/peertube/storage/videos/' | 75 | videos: '/var/www/peertube/storage/videos/' |
76 | streaming_playlists: '/var/www/peertube/storage/streaming-playlists/' | 76 | streaming_playlists: '/var/www/peertube/storage/streaming-playlists/' |
77 | redundancy: '/var/www/peertube/storage/videos/' | 77 | redundancy: '/var/www/peertube/storage/redundancy/' |
78 | logs: '/var/www/peertube/storage/logs/' | 78 | logs: '/var/www/peertube/storage/logs/' |
79 | previews: '/var/www/peertube/storage/previews/' | 79 | previews: '/var/www/peertube/storage/previews/' |
80 | thumbnails: '/var/www/peertube/storage/thumbnails/' | 80 | thumbnails: '/var/www/peertube/storage/thumbnails/' |
@@ -86,7 +86,7 @@ storage: | |||
86 | log: | 86 | log: |
87 | level: 'info' # debug/info/warning/error | 87 | level: 'info' # debug/info/warning/error |
88 | rotation: | 88 | rotation: |
89 | enabled : true | 89 | enabled : true # Enabled by default, if disabled make sure that 'storage.logs' is pointing to a folder handled by logrotate |
90 | 90 | ||
91 | search: | 91 | search: |
92 | # Add ability to fetch remote videos/actors by their URI, that may not be federated with your instance | 92 | # Add ability to fetch remote videos/actors by their URI, that may not be federated with your instance |
@@ -157,8 +157,8 @@ views: | |||
157 | max_age: -1 | 157 | max_age: -1 |
158 | 158 | ||
159 | plugins: | 159 | plugins: |
160 | # The website PeerTube will ask for available PeerTube plugins | 160 | # The website PeerTube will ask for available PeerTube plugins and themes |
161 | # This is an unmoderated plugin index, so only install plugins you trust | 161 | # This is an unmoderated plugin index, so only install plugins/themes you trust |
162 | index: | 162 | index: |
163 | enabled: true | 163 | enabled: true |
164 | check_latest_versions_interval: '12 hours' # How often you want to check new plugins/themes versions | 164 | check_latest_versions_interval: '12 hours' # How often you want to check new plugins/themes versions |
@@ -278,7 +278,7 @@ services: | |||
278 | username: '@Chocobozzz' # Indicates the Twitter account for the website or platform on which the content was published | 278 | username: '@Chocobozzz' # Indicates the Twitter account for the website or platform on which the content was published |
279 | # If true, a video player will be embedded in the Twitter feed on PeerTube video share | 279 | # If true, a video player will be embedded in the Twitter feed on PeerTube video share |
280 | # If false, we use an image link card that will redirect on your PeerTube instance | 280 | # If false, we use an image link card that will redirect on your PeerTube instance |
281 | # Test on https://cards-dev.twitter.com/validator to see if you are whitelisted | 281 | # Change it to "true", and then test on https://cards-dev.twitter.com/validator to see if you are whitelisted |
282 | whitelisted: false | 282 | whitelisted: false |
283 | 283 | ||
284 | followers: | 284 | followers: |