aboutsummaryrefslogtreecommitdiffhomepage
path: root/config
diff options
context:
space:
mode:
authorJosh Morel <morel.josh@hotmail.com>2019-04-02 05:26:47 -0400
committerChocobozzz <chocobozzz@cpy.re>2019-04-02 11:26:47 +0200
commit7ccddd7b5250bd25a917a6e77e58b87b9484a2a4 (patch)
treee75dc991369c1768804fefa114eb2a832881087f /config
parent12fed49ebab0c414713d57ea316b6488ae6bef99 (diff)
downloadPeerTube-7ccddd7b5250bd25a917a6e77e58b87b9484a2a4.tar.gz
PeerTube-7ccddd7b5250bd25a917a6e77e58b87b9484a2a4.tar.zst
PeerTube-7ccddd7b5250bd25a917a6e77e58b87b9484a2a4.zip
add quarantine videos feature (#1637)
* add quarantine videos feature * increase Notification settings test timeout to 20000ms. was completing 7000 locally but timing out after 10000 on travis * fix quarantine video test issues -propagate misspelling -remove skip from server/tests/client.ts * WIP use blacklist for moderator video approval instead of video.quarantine boolean * finish auto-blacklist feature
Diffstat (limited to 'config')
-rw-r--r--config/default.yaml6
-rw-r--r--config/production.yaml.example6
2 files changed, 12 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml
index c5bf8e457..615910478 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -162,6 +162,12 @@ import:
162 torrent: # Magnet URI or torrent file (use classic TCP/UDP/WebSeed to download the file) 162 torrent: # Magnet URI or torrent file (use classic TCP/UDP/WebSeed to download the file)
163 enabled: false 163 enabled: false
164 164
165auto_blacklist:
166 # New videos automatically blacklisted so moderators can review before publishing
167 videos:
168 of_users:
169 enabled: false
170
165instance: 171instance:
166 name: 'PeerTube' 172 name: 'PeerTube'
167 short_description: 'PeerTube, a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.' 173 short_description: 'PeerTube, a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.'
diff --git a/config/production.yaml.example b/config/production.yaml.example
index 306e5576d..5299484a5 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -176,6 +176,12 @@ import:
176 torrent: # Magnet URI or torrent file (use classic TCP/UDP/WebSeed to download the file) 176 torrent: # Magnet URI or torrent file (use classic TCP/UDP/WebSeed to download the file)
177 enabled: false 177 enabled: false
178 178
179auto_blacklist:
180 # New videos automatically blacklisted so moderators can review before publishing
181 videos:
182 of_users:
183 enabled: false
184
179# Instance settings 185# Instance settings
180instance: 186instance:
181 name: 'PeerTube' 187 name: 'PeerTube'