Server: make friends urls come from the request instead of the

configuration file
author: Chocobozzz <florian.bigard@gmail.com> 2016-08-20 16:59:25 +0200
committer: Chocobozzz <florian.bigard@gmail.com> 2016-08-20 17:11:38 +0200
commit: 1e2564d3927ce4ca4ca9a09930da6da7ebb4e9a1 (patch)
tree: 1a2601d63152da4906335c6116ba5f1e8992af33 /config
parent: e861452fb26553177ad4e32bfb18b4fd8a5b1816 (diff)
download: PeerTube-1e2564d3927ce4ca4ca9a09930da6da7ebb4e9a1.tar.gz
PeerTube-1e2564d3927ce4ca4ca9a09930da6da7ebb4e9a1.tar.zst
PeerTube-1e2564d3927ce4ca4ca9a09930da6da7ebb4e9a1.zip
7 files changed, 0 insertions, 30 deletions
diff --git a/config/default.yaml b/config/default.yaml
index b5fd7b06d..d32d3e17b 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -18,8 +18,5 @@ storage:
  logs: 'logs/'
  thumbnails: 'thumbnails/'
-network:
-  friends: []
 electron:
  debug: false
diff --git a/config/test-1.yaml b/config/test-1.yaml
index 3afcb1b04..0a8dd3937 100644
--- a/config/test-1.yaml
+++ b/config/test-1.yaml
@@ -14,7 +14,3 @@ storage:
  uploads: 'test1/uploads/'
  logs: 'test1/logs/'
  thumbnails: 'test1/thumbnails/'
-network:
-  friends:
-    - 'http://localhost:9002'
diff --git a/config/test-2.yaml b/config/test-2.yaml
index 51cc186eb..40f410559 100644
--- a/config/test-2.yaml
+++ b/config/test-2.yaml
@@ -14,7 +14,3 @@ storage:
  uploads: 'test2/uploads/'
  logs: 'test2/logs/'
  thumbnails: 'test2/thumbnails/'
-network:
-  friends:
-    - 'http://localhost:9003'
diff --git a/config/test-3.yaml b/config/test-3.yaml
index 7ef01ba4d..87b335228 100644
--- a/config/test-3.yaml
+++ b/config/test-3.yaml
@@ -14,7 +14,3 @@ storage:
  uploads: 'test3/uploads/'
  logs: 'test3/logs/'
  thumbnails: 'test3/thumbnails/'
-network:
-  friends:
-    - 'http://localhost:9001'
diff --git a/config/test-4.yaml b/config/test-4.yaml
index a4d3bb164..22abc0a58 100644
--- a/config/test-4.yaml
+++ b/config/test-4.yaml
@@ -14,7 +14,3 @@ storage:
  uploads: 'test4/uploads/'
  logs: 'test4/logs/'
  thumbnails: 'test4/thumbnails/'
-network:
-  friends:
-    - 'http://localhost:9002'
diff --git a/config/test-5.yaml b/config/test-5.yaml
index 0435c17fe..af5619994 100644
--- a/config/test-5.yaml
+++ b/config/test-5.yaml
@@ -14,8 +14,3 @@ storage:
  uploads: 'test5/uploads/'
  logs: 'test5/logs/'
  thumbnails: 'test5/thumbnails/'
-network:
-  friends:
-    - 'http://localhost:9001'
-    - 'http://localhost:9004'
diff --git a/config/test-6.yaml b/config/test-6.yaml
index b7dbd4bdd..5b8bf306b 100644
--- a/config/test-6.yaml
+++ b/config/test-6.yaml
@@ -14,9 +14,3 @@ storage:
  uploads: 'test6/uploads/'
  logs: 'test6/logs/'
  thumbnails: 'test6/thumbnails/'
-network:
-  friends:
-    - 'http://localhost:9001'
-    - 'http://localhost:9002'
-    - 'http://localhost:9003'
author	Chocobozzz <florian.bigard@gmail.com>	2016-08-20 16:59:25 +0200
committer	Chocobozzz <florian.bigard@gmail.com>	2016-08-20 17:11:38 +0200
commit	1e2564d3927ce4ca4ca9a09930da6da7ebb4e9a1 (patch)
tree	1a2601d63152da4906335c6116ba5f1e8992af33 /config
parent	e861452fb26553177ad4e32bfb18b4fd8a5b1816 (diff)
download	PeerTube-1e2564d3927ce4ca4ca9a09930da6da7ebb4e9a1.tar.gz PeerTube-1e2564d3927ce4ca4ca9a09930da6da7ebb4e9a1.tar.zst PeerTube-1e2564d3927ce4ca4ca9a09930da6da7ebb4e9a1.zip

diff --git a/config/default.yaml b/config/default.yaml index b5fd7b06d..d32d3e17b 100644 --- a/config/default.yaml +++ b/config/default.yaml
@@ -18,8 +18,5 @@ storage:
18	logs: 'logs/'	18	logs: 'logs/'
19	thumbnails: 'thumbnails/'	19	thumbnails: 'thumbnails/'
20		20
21	network:
22	friends: []
23
24	electron:	21	electron:
25	debug: false	22	debug: false


diff --git a/config/test-1.yaml b/config/test-1.yaml index 3afcb1b04..0a8dd3937 100644 --- a/config/test-1.yaml +++ b/config/test-1.yaml
@@ -14,7 +14,3 @@ 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
18	network:
19	friends:
20	- 'http://localhost:9002'


diff --git a/config/test-2.yaml b/config/test-2.yaml index 51cc186eb..40f410559 100644 --- a/config/test-2.yaml +++ b/config/test-2.yaml
@@ -14,7 +14,3 @@ 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
18	network:
19	friends:
20	- 'http://localhost:9003'


diff --git a/config/test-3.yaml b/config/test-3.yaml index 7ef01ba4d..87b335228 100644 --- a/config/test-3.yaml +++ b/config/test-3.yaml
@@ -14,7 +14,3 @@ 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
18	network:
19	friends:
20	- 'http://localhost:9001'


diff --git a/config/test-4.yaml b/config/test-4.yaml index a4d3bb164..22abc0a58 100644 --- a/config/test-4.yaml +++ b/config/test-4.yaml
@@ -14,7 +14,3 @@ 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
18	network:
19	friends:
20	- 'http://localhost:9002'


diff --git a/config/test-5.yaml b/config/test-5.yaml index 0435c17fe..af5619994 100644 --- a/config/test-5.yaml +++ b/config/test-5.yaml
@@ -14,8 +14,3 @@ 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
18	network:
19	friends:
20	- 'http://localhost:9001'
21	- 'http://localhost:9004'


diff --git a/config/test-6.yaml b/config/test-6.yaml index b7dbd4bdd..5b8bf306b 100644 --- a/config/test-6.yaml +++ b/config/test-6.yaml
@@ -14,9 +14,3 @@ 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
18	network:
19	friends:
20	- 'http://localhost:9001'
21	- 'http://localhost:9002'
22	- 'http://localhost:9003'