Merge branch 'develop' of framagit.org:chocobozzz/PeerTube into develop

[oweals/peertube.git] / config / test.yaml

diff --git a/config/test.yaml b/config/test.yaml
index efca85aff40a788ddded4c6e2e6506741ccd34bb..020987920d1d63a8ef22dabdbe99f99f6cc4fc3f 100644 (file)
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -12,6 +12,7 @@ smtp:
   hostname: null
   port: 1025
   tls: false
+  disable_starttls: true
   from_address: 'test-admin@localhost'
   username: null
   password: null
@@ -25,3 +26,12 @@ signup:
 transcoding:
   enabled: true
   threads: 2
+  resolutions:
+    240p: true
+    360p: true
+    480p: true
+    720p: true
+    1080p: true
+
+instance:
+  default_nsfw_policy: 'display'
\ No newline at end of file