Merge branch 'master' into webseed-merged

config/default.yaml

@@ -19,8 +19,5 @@ storage:
   thumbnails: 'thumbnails/'
   torrents: 'torrents/'
 
-network:
-  friends: []
-
 electron:
   debug: false

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'

config/test-1.yaml

@@ -15,7 +15,3 @@ storage:
   logs: 'test1/logs/'
   thumbnails: 'test1/thumbnails/'
   torrents: 'test1/torrents/'
-
-network:
-  friends:
-    - 'http://localhost:9002'

config/test-2.yaml

@@ -15,7 +15,3 @@ storage:
   logs: 'test2/logs/'
   thumbnails: 'test2/thumbnails/'
   torrents: 'test2/torrents/'
-
-network:
-  friends:
-    - 'http://localhost:9003'

config/test-3.yaml

@@ -15,7 +15,3 @@ storage:
   logs: 'test3/logs/'
   thumbnails: 'test3/thumbnails/'
   torrents: 'test3/torrents/'
-
-network:
-  friends:
-    - 'http://localhost:9001'

config/test-4.yaml

@@ -15,7 +15,3 @@ storage:
   logs: 'test4/logs/'
   thumbnails: 'test4/thumbnails/'
   torrents: 'test4/torrents/'
-
-network:
-  friends:
-    - 'http://localhost:9002'

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'

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'