diff options
Diffstat (limited to 'config')
-rw-r--r-- | config/default.yaml | 8 | ||||
-rw-r--r-- | config/production.yaml.example | 8 | ||||
-rw-r--r-- | config/test.yaml | 5 |
3 files changed, 21 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml index bc0530d79..5fa7e5945 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
@@ -22,6 +22,8 @@ database: | |||
22 | suffix: '_dev' | 22 | suffix: '_dev' |
23 | username: 'peertube' | 23 | username: 'peertube' |
24 | password: 'peertube' | 24 | password: 'peertube' |
25 | pool: | ||
26 | max: 5 | ||
25 | 27 | ||
26 | # You can also specify a 'socket' path to a unix socket but first need to | 28 | # You can also specify a 'socket' path to a unix socket but first need to |
27 | # comment out hostname and port | 29 | # comment out hostname and port |
@@ -90,6 +92,12 @@ transcoding: | |||
90 | 720p: false | 92 | 720p: false |
91 | 1080p: false | 93 | 1080p: false |
92 | 94 | ||
95 | import: | ||
96 | # Add ability for your users to import remote videos (from YouTube, torrent...) | ||
97 | videos: | ||
98 | http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html | ||
99 | enabled: false | ||
100 | |||
93 | instance: | 101 | instance: |
94 | name: 'PeerTube' | 102 | name: 'PeerTube' |
95 | short_description: 'PeerTube, a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.' | 103 | 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 d347b0ece..635a41e9e 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example | |||
@@ -21,6 +21,8 @@ database: | |||
21 | suffix: '_prod' | 21 | suffix: '_prod' |
22 | username: 'peertube' | 22 | username: 'peertube' |
23 | password: 'peertube' | 23 | password: 'peertube' |
24 | pool: | ||
25 | max: 5 | ||
24 | 26 | ||
25 | # Redis server for short time storage | 27 | # Redis server for short time storage |
26 | # You can also specify a 'socket' path to a unix socket but first need to | 28 | # You can also specify a 'socket' path to a unix socket but first need to |
@@ -104,6 +106,12 @@ transcoding: | |||
104 | 720p: false | 106 | 720p: false |
105 | 1080p: false | 107 | 1080p: false |
106 | 108 | ||
109 | import: | ||
110 | # Add ability for your users to import remote videos (from YouTube, torrent...) | ||
111 | videos: | ||
112 | http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html | ||
113 | enabled: false | ||
114 | |||
107 | # Instance settings | 115 | # Instance settings |
108 | instance: | 116 | instance: |
109 | name: 'PeerTube' | 117 | name: 'PeerTube' |
diff --git a/config/test.yaml b/config/test.yaml index ffe736b24..3c51785f2 100644 --- a/config/test.yaml +++ b/config/test.yaml | |||
@@ -40,5 +40,10 @@ transcoding: | |||
40 | 720p: true | 40 | 720p: true |
41 | 1080p: true | 41 | 1080p: true |
42 | 42 | ||
43 | import: | ||
44 | videos: | ||
45 | http: | ||
46 | enabled: true | ||
47 | |||
43 | instance: | 48 | instance: |
44 | default_nsfw_policy: 'display' \ No newline at end of file | 49 | default_nsfw_policy: 'display' \ No newline at end of file |