diff options
author | Chocobozzz <me@florianbigard.com> | 2018-04-19 11:01:34 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-04-19 11:01:34 +0200 |
commit | 0883b3245bf0deb9106c4041e9afbd3521b79280 (patch) | |
tree | fcb73005e0b31a3b763ee5d22d5fc39c2da89907 /config | |
parent | 04ed10b21e8e1339514faae0bb690e4d97c23b0a (diff) | |
download | PeerTube-0883b3245bf0deb9106c4041e9afbd3521b79280.tar.gz PeerTube-0883b3245bf0deb9106c4041e9afbd3521b79280.tar.zst PeerTube-0883b3245bf0deb9106c4041e9afbd3521b79280.zip |
Add ability to choose what policy we have for NSFW videos
There is a global instance setting and a per user setting
Diffstat (limited to 'config')
-rw-r--r-- | config/default.yaml | 3 | ||||
-rw-r--r-- | config/production.yaml.example | 3 | ||||
-rw-r--r-- | config/test.yaml | 3 |
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 | |||
36 | instance: | ||
37 | default_nsfw_policy: 'display' \ No newline at end of file | ||