diff options
author | kontrollanten <6680299+kontrollanten@users.noreply.github.com> | 2022-10-04 10:53:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-04 10:53:00 +0200 |
commit | 6c5f0d3aebbd9debcd33a9aab306b130547852a5 (patch) | |
tree | bb5da168dc1d60f13c3fd6247fa9082928529a8a /config | |
parent | cfd57d2ca0bb058087f7dc90fcc3e8442b0288e1 (diff) | |
download | PeerTube-6c5f0d3aebbd9debcd33a9aab306b130547852a5.tar.gz PeerTube-6c5f0d3aebbd9debcd33a9aab306b130547852a5.tar.zst PeerTube-6c5f0d3aebbd9debcd33a9aab306b130547852a5.zip |
server: serve files from storage/well-known (#5214)
* server: serve files from storage/well-known
closes #5206
* well-known: add tests
* test: try to skip new tests
* test: another try
* fix(config/prod): well_known path
* test: fix broken tests
* Update misc-endpoints.ts
* Use getDirectoryPath for tests
* Fix tests
Co-authored-by: Chocobozzz <me@florianbigard.com>
Diffstat (limited to 'config')
-rw-r--r-- | config/default.yaml | 1 | ||||
-rw-r--r-- | config/production.yaml.example | 1 | ||||
-rw-r--r-- | config/test-1.yaml | 1 | ||||
-rw-r--r-- | config/test-2.yaml | 1 | ||||
-rw-r--r-- | config/test-3.yaml | 1 | ||||
-rw-r--r-- | config/test-4.yaml | 1 | ||||
-rw-r--r-- | config/test-5.yaml | 1 | ||||
-rw-r--r-- | config/test-6.yaml | 1 |
8 files changed, 8 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml index 3a0b494fb..2d8aaf1ea 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
@@ -122,6 +122,7 @@ storage: | |||
122 | captions: 'storage/captions/' | 122 | captions: 'storage/captions/' |
123 | cache: 'storage/cache/' | 123 | cache: 'storage/cache/' |
124 | plugins: 'storage/plugins/' | 124 | plugins: 'storage/plugins/' |
125 | well_known: 'storage/well-known/' | ||
125 | # Overridable client files in client/dist/assets/images: | 126 | # Overridable client files in client/dist/assets/images: |
126 | # - logo.svg | 127 | # - logo.svg |
127 | # - favicon.png | 128 | # - favicon.png |
diff --git a/config/production.yaml.example b/config/production.yaml.example index dafc15915..46d574e42 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example | |||
@@ -120,6 +120,7 @@ storage: | |||
120 | captions: '/var/www/peertube/storage/captions/' | 120 | captions: '/var/www/peertube/storage/captions/' |
121 | cache: '/var/www/peertube/storage/cache/' | 121 | cache: '/var/www/peertube/storage/cache/' |
122 | plugins: '/var/www/peertube/storage/plugins/' | 122 | plugins: '/var/www/peertube/storage/plugins/' |
123 | well_known: '/var/www/peertube/storage/well-known/' | ||
123 | # Overridable client files in client/dist/assets/images: | 124 | # Overridable client files in client/dist/assets/images: |
124 | # - logo.svg | 125 | # - logo.svg |
125 | # - favicon.png | 126 | # - favicon.png |
diff --git a/config/test-1.yaml b/config/test-1.yaml index fd6a5a341..1402f3048 100644 --- a/config/test-1.yaml +++ b/config/test-1.yaml | |||
@@ -23,6 +23,7 @@ storage: | |||
23 | captions: 'test1/captions/' | 23 | captions: 'test1/captions/' |
24 | cache: 'test1/cache/' | 24 | cache: 'test1/cache/' |
25 | plugins: 'test1/plugins/' | 25 | plugins: 'test1/plugins/' |
26 | well_known: 'test1/well-known/' | ||
26 | client_overrides: 'test1/client-overrides/' | 27 | client_overrides: 'test1/client-overrides/' |
27 | 28 | ||
28 | admin: | 29 | admin: |
diff --git a/config/test-2.yaml b/config/test-2.yaml index 5a4ba0abd..5d9db762f 100644 --- a/config/test-2.yaml +++ b/config/test-2.yaml | |||
@@ -23,6 +23,7 @@ storage: | |||
23 | captions: 'test2/captions/' | 23 | captions: 'test2/captions/' |
24 | cache: 'test2/cache/' | 24 | cache: 'test2/cache/' |
25 | plugins: 'test2/plugins/' | 25 | plugins: 'test2/plugins/' |
26 | well_known: 'test2/well-known/' | ||
26 | client_overrides: 'test2/client-overrides/' | 27 | client_overrides: 'test2/client-overrides/' |
27 | 28 | ||
28 | admin: | 29 | admin: |
diff --git a/config/test-3.yaml b/config/test-3.yaml index c04df6029..97fe9cd44 100644 --- a/config/test-3.yaml +++ b/config/test-3.yaml | |||
@@ -23,6 +23,7 @@ storage: | |||
23 | captions: 'test3/captions/' | 23 | captions: 'test3/captions/' |
24 | cache: 'test3/cache/' | 24 | cache: 'test3/cache/' |
25 | plugins: 'test3/plugins/' | 25 | plugins: 'test3/plugins/' |
26 | well_known: 'test3/well-known/' | ||
26 | client_overrides: 'test3/client-overrides/' | 27 | client_overrides: 'test3/client-overrides/' |
27 | 28 | ||
28 | admin: | 29 | admin: |
diff --git a/config/test-4.yaml b/config/test-4.yaml index 963dee547..328e70fa6 100644 --- a/config/test-4.yaml +++ b/config/test-4.yaml | |||
@@ -23,6 +23,7 @@ storage: | |||
23 | captions: 'test4/captions/' | 23 | captions: 'test4/captions/' |
24 | cache: 'test4/cache/' | 24 | cache: 'test4/cache/' |
25 | plugins: 'test4/plugins/' | 25 | plugins: 'test4/plugins/' |
26 | well_known: 'test4/well-known/' | ||
26 | client_overrides: 'test4/client-overrides/' | 27 | client_overrides: 'test4/client-overrides/' |
27 | 28 | ||
28 | admin: | 29 | admin: |
diff --git a/config/test-5.yaml b/config/test-5.yaml index f41378c24..3e6ca9c12 100644 --- a/config/test-5.yaml +++ b/config/test-5.yaml | |||
@@ -23,6 +23,7 @@ storage: | |||
23 | captions: 'test5/captions/' | 23 | captions: 'test5/captions/' |
24 | cache: 'test5/cache/' | 24 | cache: 'test5/cache/' |
25 | plugins: 'test5/plugins/' | 25 | plugins: 'test5/plugins/' |
26 | well_known: 'test5/well-known/' | ||
26 | client_overrides: 'test5/client-overrides/' | 27 | client_overrides: 'test5/client-overrides/' |
27 | 28 | ||
28 | admin: | 29 | admin: |
diff --git a/config/test-6.yaml b/config/test-6.yaml index 574f89d19..89a71593f 100644 --- a/config/test-6.yaml +++ b/config/test-6.yaml | |||
@@ -23,6 +23,7 @@ storage: | |||
23 | captions: 'test6/captions/' | 23 | captions: 'test6/captions/' |
24 | cache: 'test6/cache/' | 24 | cache: 'test6/cache/' |
25 | plugins: 'test6/plugins/' | 25 | plugins: 'test6/plugins/' |
26 | well_known: 'test6/well-known/' | ||
26 | client_overrides: 'test6/client-overrides/' | 27 | client_overrides: 'test6/client-overrides/' |
27 | 28 | ||
28 | admin: | 29 | admin: |