aboutsummaryrefslogtreecommitdiffhomepage
path: root/config
diff options
context:
space:
mode:
authorGérald Niel <gerald.niel@gegeweb.org>2018-04-19 19:28:55 +0200
committerGérald Niel <gerald.niel@gegeweb.org>2018-04-19 19:28:55 +0200
commit0db1a226507a39b0a663e3e63f04851836a44d5a (patch)
tree8c8dad658ea5608afaae238cfb6fe803292f908f /config
parent0030284b0df2983914291d6fe83675e2aa892e6a (diff)
parentd4f3fea659163749f9ea879a5e1dd313106353c6 (diff)
downloadPeerTube-0db1a226507a39b0a663e3e63f04851836a44d5a.tar.gz
PeerTube-0db1a226507a39b0a663e3e63f04851836a44d5a.tar.zst
PeerTube-0db1a226507a39b0a663e3e63f04851836a44d5a.zip
Merge branch 'develop' of framagit.org:chocobozzz/PeerTube into develop
Diffstat (limited to 'config')
-rw-r--r--config/default.yaml3
-rw-r--r--config/production.yaml.example3
-rw-r--r--config/test.yaml3
3 files changed, 9 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml
index 9f4a76621..25dde72c9 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -84,6 +84,9 @@ instance:
84 description: 'Welcome to this PeerTube instance!' # Support markdown 84 description: 'Welcome to this PeerTube instance!' # Support markdown
85 terms: 'No terms for now.' # Support markdown 85 terms: 'No terms for now.' # Support markdown
86 default_client_route: '/videos/trending' 86 default_client_route: '/videos/trending'
87 # By default, "do_not_list" or "blur" or "display" NSFW videos
88 # Could be overridden per user with a setting
89 default_nsfw_policy: 'do_not_list'
87 customizations: 90 customizations:
88 javascript: '' # Directly your JavaScript code (without <script> tags). Will be eval at runtime 91 javascript: '' # Directly your JavaScript code (without <script> tags). Will be eval at runtime
89 css: '' # Directly your CSS code (without <style> tags). Will be injected at runtime 92 css: '' # Directly your CSS code (without <style> tags). Will be injected at runtime
diff --git a/config/production.yaml.example b/config/production.yaml.example
index fc06c51fb..1d7d35c9c 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -100,6 +100,9 @@ instance:
100 description: '' # Support markdown 100 description: '' # Support markdown
101 terms: '' # Support markdown 101 terms: '' # Support markdown
102 default_client_route: '/videos/trending' 102 default_client_route: '/videos/trending'
103 # By default, "do_not_list" or "blur" or "display" NSFW videos
104 # Could be overridden per user with a setting
105 default_nsfw_policy: 'do_not_list'
103 customizations: 106 customizations:
104 javascript: '' # Directly your JavaScript code (without <script> tags). Will be eval at runtime 107 javascript: '' # Directly your JavaScript code (without <script> tags). Will be eval at runtime
105 css: '' # Directly your CSS code (without <style> tags). Will be injected at runtime 108 css: '' # Directly your CSS code (without <style> tags). Will be injected at runtime
diff --git a/config/test.yaml b/config/test.yaml
index 7e395db04..020987920 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -32,3 +32,6 @@ transcoding:
32 480p: true 32 480p: true
33 720p: true 33 720p: true
34 1080p: true 34 1080p: true
35
36instance:
37 default_nsfw_policy: 'display' \ No newline at end of file