Merge branch 'master' into webseed-merged

8 files changed, 4 insertions, 30 deletions

diff --git a/config/default.yaml b/config/default.yaml
index 9a8a57879..b44be31b0 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -19,8 +19,5 @@ storage:
   thumbnails: 'thumbnails/'
   torrents: 'torrents/'
 
-network:
-  friends: []
-
 electron:
   debug: false
diff --git a/config/production.yaml.example b/config/production.yaml.example
index 6dc79d73f..8bc63ee92 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -1,4 +1,8 @@
+# Correspond to your reverse proxy "listen" configuration
 webserver:
   https: false
   host: 'example.com'
   port: 80
+
+database:
+  suffix: '-prod'
diff --git a/config/test-1.yaml b/config/test-1.yaml
index 0998eaea1..a59566cc4 100644
--- a/config/test-1.yaml
+++ b/config/test-1.yaml
@@ -15,7 +15,3 @@ storage:
   logs: 'test1/logs/'
   thumbnails: 'test1/thumbnails/'
   torrents: 'test1/torrents/'
-
-network:
-  friends:
-    - 'http://localhost:9002'
diff --git a/config/test-2.yaml b/config/test-2.yaml
index ec2cff811..1b937898f 100644
--- a/config/test-2.yaml
+++ b/config/test-2.yaml
@@ -15,7 +15,3 @@ storage:
   logs: 'test2/logs/'
   thumbnails: 'test2/thumbnails/'
   torrents: 'test2/torrents/'
-
-network:
-  friends:
-    - 'http://localhost:9003'
diff --git a/config/test-3.yaml b/config/test-3.yaml
index 24f5533e0..e522c13e7 100644
--- a/config/test-3.yaml
+++ b/config/test-3.yaml
@@ -15,7 +15,3 @@ storage:
   logs: 'test3/logs/'
   thumbnails: 'test3/thumbnails/'
   torrents: 'test3/torrents/'
-
-network:
-  friends:
-    - 'http://localhost:9001'
diff --git a/config/test-4.yaml b/config/test-4.yaml
index 1f884dbf2..e30cd7978 100644
--- a/config/test-4.yaml
+++ b/config/test-4.yaml
@@ -15,7 +15,3 @@ storage:
   logs: 'test4/logs/'
   thumbnails: 'test4/thumbnails/'
   torrents: 'test4/torrents/'
-
-network:
-  friends:
-    - 'http://localhost:9002'
diff --git a/config/test-5.yaml b/config/test-5.yaml
index 08ed9f068..3a54599f5 100644
--- a/config/test-5.yaml
+++ b/config/test-5.yaml
@@ -15,8 +15,3 @@ storage:
   logs: 'test5/logs/'
   thumbnails: 'test5/thumbnails/'
   torrents: 'test5/torrents/'
-
-network:
-  friends:
-    - 'http://localhost:9001'
-    - 'http://localhost:9004'
diff --git a/config/test-6.yaml b/config/test-6.yaml
index a57784cca..31608add2 100644
--- a/config/test-6.yaml
+++ b/config/test-6.yaml
@@ -15,9 +15,3 @@ storage:
   logs: 'test6/logs/'
   thumbnails: 'test6/thumbnails/'
   torrents: 'test6/torrents/'
-
-network:
-  friends:
-    - 'http://localhost:9001'
-    - 'http://localhost:9002'
-    - 'http://localhost:9003'