diff options
author | Chocobozzz <me@florianbigard.com> | 2019-02-06 12:26:58 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-02-06 12:26:58 +0100 |
commit | 73471b1a52f242e86364ffb077ea6cadb3b07ae2 (patch) | |
tree | 43dbb7748e281f8d80f15326f489cdea10ec857d /config/default.yaml | |
parent | c22419dd265c0c7185bf4197a1cb286eb3d8ebc0 (diff) | |
parent | f5305c04aae14467d6f957b713c5a902275cbb89 (diff) | |
download | PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.tar.gz PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.tar.zst PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.zip |
Merge branch 'release/v1.2.0'
Diffstat (limited to 'config/default.yaml')
-rw-r--r-- | config/default.yaml | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/config/default.yaml b/config/default.yaml index 257ec7ed1..e16b8c352 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
@@ -45,8 +45,10 @@ smtp: | |||
45 | 45 | ||
46 | # From the project root directory | 46 | # From the project root directory |
47 | storage: | 47 | storage: |
48 | tmp: 'storage/tmp/' # Used to download data (imports etc), store uploaded files before processing... | ||
48 | avatars: 'storage/avatars/' | 49 | avatars: 'storage/avatars/' |
49 | videos: 'storage/videos/' | 50 | videos: 'storage/videos/' |
51 | redundancy: 'storage/redundancy/' | ||
50 | logs: 'storage/logs/' | 52 | logs: 'storage/logs/' |
51 | previews: 'storage/previews/' | 53 | previews: 'storage/previews/' |
52 | thumbnails: 'storage/thumbnails/' | 54 | thumbnails: 'storage/thumbnails/' |
@@ -75,7 +77,7 @@ trending: | |||
75 | redundancy: | 77 | redundancy: |
76 | videos: | 78 | videos: |
77 | check_interval: '1 hour' # How often you want to check new videos to cache | 79 | check_interval: '1 hour' # How often you want to check new videos to cache |
78 | strategies: | 80 | strategies: # Just uncomment strategies you want |
79 | # - | 81 | # - |
80 | # size: '10GB' | 82 | # size: '10GB' |
81 | # # Minimum time the video must remain in the cache. Only accept values > 10 hours (to not overload remote instances) | 83 | # # Minimum time the video must remain in the cache. Only accept values > 10 hours (to not overload remote instances) |
@@ -100,7 +102,12 @@ cache: | |||
100 | size: 500 # Max number of video captions/subtitles you want to cache | 102 | size: 500 # Max number of video captions/subtitles you want to cache |
101 | 103 | ||
102 | admin: | 104 | admin: |
103 | email: 'admin@example.com' # Your personal email as administrator | 105 | # Used to generate the root user at first startup |
106 | # And to receive emails from the contact form | ||
107 | email: 'admin@example.com' | ||
108 | |||
109 | contact_form: | ||
110 | enabled: true | ||
104 | 111 | ||
105 | signup: | 112 | signup: |
106 | enabled: false | 113 | enabled: false |
@@ -122,6 +129,8 @@ user: | |||
122 | # Please, do not disable transcoding since many uploaded videos will not work | 129 | # Please, do not disable transcoding since many uploaded videos will not work |
123 | transcoding: | 130 | transcoding: |
124 | enabled: true | 131 | enabled: true |
132 | # Allow your users to upload .mkv, .mov, .avi, .flv videos | ||
133 | allow_additional_extensions: true | ||
125 | threads: 1 | 134 | threads: 1 |
126 | resolutions: # Only created if the original video has a higher resolution, uses more storage! | 135 | resolutions: # Only created if the original video has a higher resolution, uses more storage! |
127 | 240p: false | 136 | 240p: false |
@@ -159,6 +168,8 @@ instance: | |||
159 | "# If you would like to report a security issue\n# you may report it to:\nContact: https://github.com/Chocobozzz/PeerTube/blob/develop/SECURITY.md\nContact: mailto:" | 168 | "# If you would like to report a security issue\n# you may report it to:\nContact: https://github.com/Chocobozzz/PeerTube/blob/develop/SECURITY.md\nContact: mailto:" |
160 | 169 | ||
161 | services: | 170 | services: |
171 | # You can provide a reporting endpoint for Content Security Policy violations | ||
172 | csp-logger: | ||
162 | # Cards configuration to format video in Twitter | 173 | # Cards configuration to format video in Twitter |
163 | twitter: | 174 | twitter: |
164 | username: '@Chocobozzz' # Indicates the Twitter account for the website or platform on which the content was published | 175 | username: '@Chocobozzz' # Indicates the Twitter account for the website or platform on which the content was published |