From 1e2564d3927ce4ca4ca9a09930da6da7ebb4e9a1 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Sat, 20 Aug 2016 16:59:25 +0200 Subject: Server: make friends urls come from the request instead of the configuration file --- config/default.yaml | 3 --- config/test-1.yaml | 4 ---- config/test-2.yaml | 4 ---- config/test-3.yaml | 4 ---- config/test-4.yaml | 4 ---- config/test-5.yaml | 5 ----- config/test-6.yaml | 6 ------ 7 files changed, 30 deletions(-) (limited to 'config') 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' -- cgit v1.2.3 From 21511bbafc33a109dc8951482e2a0ceac2dc565f Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Sat, 1 Oct 2016 12:24:18 +0200 Subject: Add a comment to the webserver part in the yaml configuration --- config/production.yaml.example | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/production.yaml.example b/config/production.yaml.example index 6dc79d73f..df216ac92 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example @@ -1,3 +1,4 @@ +# Correspond to your reverse proxy "listen" configuration webserver: https: false host: 'example.com' -- cgit v1.2.3 From 825a5d9c5e6d8cbe005b44499aba4ce4ba069fe3 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Sat, 1 Oct 2016 12:40:02 +0200 Subject: Add database suffix to the production configuration example --- config/production.yaml.example | 3 +++ 1 file changed, 3 insertions(+) (limited to 'config') diff --git a/config/production.yaml.example b/config/production.yaml.example index df216ac92..8bc63ee92 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example @@ -3,3 +3,6 @@ webserver: https: false host: 'example.com' port: 80 + +database: + suffix: '-prod' -- cgit v1.2.3