diff options
| author | Chocobozzz <florian.bigard@gmail.com> | 2016-10-07 10:10:00 +0200 |
|---|---|---|
| committer | Chocobozzz <florian.bigard@gmail.com> | 2016-10-07 10:10:00 +0200 |
| commit | aff36eb063573532498979c83be1c279c84f2d53 (patch) | |
| tree | 3f79dc7373689f0493e80a6e501225fd0cd7aa26 /config | |
| parent | c3117f13d599f37693f937865b6e84eb1f72d5c4 (diff) | |
| parent | a6375e69668ea42e19531c6bc68dcd37f3f7cbd7 (diff) | |
| download | PeerTube-aff36eb063573532498979c83be1c279c84f2d53.tar.gz PeerTube-aff36eb063573532498979c83be1c279c84f2d53.tar.zst PeerTube-aff36eb063573532498979c83be1c279c84f2d53.zip | |
Merge branch 'webseed'
Diffstat (limited to 'config')
| -rw-r--r-- | config/default.yaml | 1 | ||||
| -rw-r--r-- | config/test-1.yaml | 1 | ||||
| -rw-r--r-- | config/test-2.yaml | 1 | ||||
| -rw-r--r-- | config/test-3.yaml | 1 | ||||
| -rw-r--r-- | config/test-4.yaml | 1 | ||||
| -rw-r--r-- | config/test-5.yaml | 1 | ||||
| -rw-r--r-- | config/test-6.yaml | 1 |
7 files changed, 7 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml index d32d3e17b..b44be31b0 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
| @@ -17,6 +17,7 @@ storage: | |||
| 17 | uploads: 'uploads/' | 17 | uploads: 'uploads/' |
| 18 | logs: 'logs/' | 18 | logs: 'logs/' |
| 19 | thumbnails: 'thumbnails/' | 19 | thumbnails: 'thumbnails/' |
| 20 | torrents: 'torrents/' | ||
| 20 | 21 | ||
| 21 | electron: | 22 | electron: |
| 22 | debug: false | 23 | debug: false |
diff --git a/config/test-1.yaml b/config/test-1.yaml index 0a8dd3937..a59566cc4 100644 --- a/config/test-1.yaml +++ b/config/test-1.yaml | |||
| @@ -14,3 +14,4 @@ storage: | |||
| 14 | uploads: 'test1/uploads/' | 14 | uploads: 'test1/uploads/' |
| 15 | logs: 'test1/logs/' | 15 | logs: 'test1/logs/' |
| 16 | thumbnails: 'test1/thumbnails/' | 16 | thumbnails: 'test1/thumbnails/' |
| 17 | torrents: 'test1/torrents/' | ||
diff --git a/config/test-2.yaml b/config/test-2.yaml index 40f410559..1b937898f 100644 --- a/config/test-2.yaml +++ b/config/test-2.yaml | |||
| @@ -14,3 +14,4 @@ storage: | |||
| 14 | uploads: 'test2/uploads/' | 14 | uploads: 'test2/uploads/' |
| 15 | logs: 'test2/logs/' | 15 | logs: 'test2/logs/' |
| 16 | thumbnails: 'test2/thumbnails/' | 16 | thumbnails: 'test2/thumbnails/' |
| 17 | torrents: 'test2/torrents/' | ||
diff --git a/config/test-3.yaml b/config/test-3.yaml index 87b335228..e522c13e7 100644 --- a/config/test-3.yaml +++ b/config/test-3.yaml | |||
| @@ -14,3 +14,4 @@ storage: | |||
| 14 | uploads: 'test3/uploads/' | 14 | uploads: 'test3/uploads/' |
| 15 | logs: 'test3/logs/' | 15 | logs: 'test3/logs/' |
| 16 | thumbnails: 'test3/thumbnails/' | 16 | thumbnails: 'test3/thumbnails/' |
| 17 | torrents: 'test3/torrents/' | ||
diff --git a/config/test-4.yaml b/config/test-4.yaml index 22abc0a58..e30cd7978 100644 --- a/config/test-4.yaml +++ b/config/test-4.yaml | |||
| @@ -14,3 +14,4 @@ storage: | |||
| 14 | uploads: 'test4/uploads/' | 14 | uploads: 'test4/uploads/' |
| 15 | logs: 'test4/logs/' | 15 | logs: 'test4/logs/' |
| 16 | thumbnails: 'test4/thumbnails/' | 16 | thumbnails: 'test4/thumbnails/' |
| 17 | torrents: 'test4/torrents/' | ||
diff --git a/config/test-5.yaml b/config/test-5.yaml index af5619994..3a54599f5 100644 --- a/config/test-5.yaml +++ b/config/test-5.yaml | |||
| @@ -14,3 +14,4 @@ storage: | |||
| 14 | uploads: 'test5/uploads/' | 14 | uploads: 'test5/uploads/' |
| 15 | logs: 'test5/logs/' | 15 | logs: 'test5/logs/' |
| 16 | thumbnails: 'test5/thumbnails/' | 16 | thumbnails: 'test5/thumbnails/' |
| 17 | torrents: 'test5/torrents/' | ||
diff --git a/config/test-6.yaml b/config/test-6.yaml index 5b8bf306b..31608add2 100644 --- a/config/test-6.yaml +++ b/config/test-6.yaml | |||
| @@ -14,3 +14,4 @@ storage: | |||
| 14 | uploads: 'test6/uploads/' | 14 | uploads: 'test6/uploads/' |
| 15 | logs: 'test6/logs/' | 15 | logs: 'test6/logs/' |
| 16 | thumbnails: 'test6/thumbnails/' | 16 | thumbnails: 'test6/thumbnails/' |
| 17 | torrents: 'test6/torrents/' | ||