From 6040f87d143a5fa01db79867ece8197c3ce7be47 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 4 Dec 2018 16:02:49 +0100
Subject: Add tmp and redundancy directories

---
 config/default.yaml            | 4 +++-
 config/production.yaml.example | 4 +++-
 config/test-1.yaml             | 2 ++
 config/test-2.yaml             | 2 ++
 config/test-3.yaml             | 2 ++
 config/test-4.yaml             | 2 ++
 config/test-5.yaml             | 2 ++
 config/test-6.yaml             | 2 ++
 config/test.yaml               | 2 +-
 9 files changed, 19 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/config/default.yaml b/config/default.yaml
index 257ec7ed1..d95fdc57b 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -45,8 +45,10 @@ smtp:
 
 # From the project root directory
 storage:
+  tmp: 'storage/tmp/' # Used to download data (imports etc), store uploaded files before processing...
   avatars: 'storage/avatars/'
   videos: 'storage/videos/'
+  redundancy: 'storage/redundancy/'
   logs: 'storage/logs/'
   previews: 'storage/previews/'
   thumbnails: 'storage/thumbnails/'
@@ -75,7 +77,7 @@ trending:
 redundancy:
   videos:
     check_interval: '1 hour' # How often you want to check new videos to cache
-    strategies:
+    strategies: # Just uncomment strategies you want
 #      -
 #        size: '10GB'
 #        # Minimum time the video must remain in the cache. Only accept values > 10 hours (to not overload remote instances)
diff --git a/config/production.yaml.example b/config/production.yaml.example
index ac15fc736..4c50a550b 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -46,8 +46,10 @@ smtp:
 
 # From the project root directory
 storage:
+  tmp: '/var/www/peertube/storage/tmp/' # Used to download data (imports etc), store uploaded files before processing...
   avatars: '/var/www/peertube/storage/avatars/'
   videos: '/var/www/peertube/storage/videos/'
+  redundancy: '/var/www/peertube/storage/videos/'
   logs: '/var/www/peertube/storage/logs/'
   previews: '/var/www/peertube/storage/previews/'
   thumbnails: '/var/www/peertube/storage/thumbnails/'
@@ -76,7 +78,7 @@ trending:
 redundancy:
   videos:
     check_interval: '1 hour' # How often you want to check new videos to cache
-    strategies:
+    strategies: # Just uncomment strategies you want
 #      -
 #        size: '10GB'
 #        # Minimum time the video must remain in the cache. Only accept values > 10 hours (to not overload remote instances)
diff --git a/config/test-1.yaml b/config/test-1.yaml
index 503bbc661..8f4f66d2a 100644
--- a/config/test-1.yaml
+++ b/config/test-1.yaml
@@ -10,8 +10,10 @@ database:
 
 # From the project root directory
 storage:
+  tmp: 'test1/tmp/'
   avatars: 'test1/avatars/'
   videos: 'test1/videos/'
+  redundancy: 'test1/redundancy/'
   logs: 'test1/logs/'
   previews: 'test1/previews/'
   thumbnails: 'test1/thumbnails/'
diff --git a/config/test-2.yaml b/config/test-2.yaml
index 8c77bf581..a80ec6e54 100644
--- a/config/test-2.yaml
+++ b/config/test-2.yaml
@@ -10,8 +10,10 @@ database:
 
 # From the project root directory
 storage:
+  tmp: 'test2/tmp/'
   avatars: 'test2/avatars/'
   videos: 'test2/videos/'
+  redundancy: 'test2/redundancy/'
   logs: 'test2/logs/'
   previews: 'test2/previews/'
   thumbnails: 'test2/thumbnails/'
diff --git a/config/test-3.yaml b/config/test-3.yaml
index 82d89567a..934401eb0 100644
--- a/config/test-3.yaml
+++ b/config/test-3.yaml
@@ -10,8 +10,10 @@ database:
 
 # From the project root directory
 storage:
+  tmp: 'test3/tmp/'
   avatars: 'test3/avatars/'
   videos: 'test3/videos/'
+  redundancy: 'test3/redundancy/'
   logs: 'test3/logs/'
   previews: 'test3/previews/'
   thumbnails: 'test3/thumbnails/'
diff --git a/config/test-4.yaml b/config/test-4.yaml
index 1aa56d041..ee99b250b 100644
--- a/config/test-4.yaml
+++ b/config/test-4.yaml
@@ -10,8 +10,10 @@ database:
 
 # From the project root directory
 storage:
+  tmp: 'test4/tmp/'
   avatars: 'test4/avatars/'
   videos: 'test4/videos/'
+  redundancy: 'test4/redundancy/'
   logs: 'test4/logs/'
   previews: 'test4/previews/'
   thumbnails: 'test4/thumbnails/'
diff --git a/config/test-5.yaml b/config/test-5.yaml
index 5f1c2f583..e2662bdd9 100644
--- a/config/test-5.yaml
+++ b/config/test-5.yaml
@@ -10,8 +10,10 @@ database:
 
 # From the project root directory
 storage:
+  tmp: 'test5/tmp/'
   avatars: 'test5/avatars/'
   videos: 'test5/videos/'
+  redundancy: 'test5/redundancy/'
   logs: 'test5/logs/'
   previews: 'test5/previews/'
   thumbnails: 'test5/thumbnails/'
diff --git a/config/test-6.yaml b/config/test-6.yaml
index 719629844..ad39c6a9f 100644
--- a/config/test-6.yaml
+++ b/config/test-6.yaml
@@ -10,8 +10,10 @@ database:
 
 # From the project root directory
 storage:
+  tmp: 'test6/tmp/'
   avatars: 'test6/avatars/'
   videos: 'test6/videos/'
+  redundancy: 'test6/redundancy/'
   logs: 'test6/logs/'
   previews: 'test6/previews/'
   thumbnails: 'test6/thumbnails/'
diff --git a/config/test.yaml b/config/test.yaml
index 9c051fabc..51a77e2fd 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -67,4 +67,4 @@ import:
       enabled: true
 
 instance:
-  default_nsfw_policy: 'display'
\ No newline at end of file
+  default_nsfw_policy: 'display'
-- 
cgit v1.2.3