diff options
author | kontrollanten <6680299+kontrollanten@users.noreply.github.com> | 2021-10-12 13:50:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-12 13:50:40 +0200 |
commit | c80e458afb63915163467fe9b3b147b3b4e4657d (patch) | |
tree | dfccb957220c79360e5ec7d70848e312029a508c /support | |
parent | c3bb04413ec05dfe544ec74ffdf2f264975bd121 (diff) | |
download | PeerTube-c80e458afb63915163467fe9b3b147b3b4e4657d.tar.gz PeerTube-c80e458afb63915163467fe9b3b147b3b4e4657d.tar.zst PeerTube-c80e458afb63915163467fe9b3b147b3b4e4657d.zip |
extend client-overrides with default images (#4392)
* extend client-overrides with default images
Add:
* default-playlist.png
* default-avatar-account.png
* default-avatar-videochannel.png
solves #4108
* Rename to default-avatar-video-channel.png
Co-authored-by: Chocobozzz <me@florianbigard.com>
Diffstat (limited to 'support')
-rw-r--r-- | support/docker/production/config/production.yaml | 8 | ||||
-rw-r--r-- | support/nginx/peertube | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/support/docker/production/config/production.yaml b/support/docker/production/config/production.yaml index 8c8f8d6bc..3bff8a0b0 100644 --- a/support/docker/production/config/production.yaml +++ b/support/docker/production/config/production.yaml | |||
@@ -55,7 +55,13 @@ storage: | |||
55 | captions: '../data/captions/' | 55 | captions: '../data/captions/' |
56 | cache: '../data/cache/' | 56 | cache: '../data/cache/' |
57 | plugins: '../data/plugins/' | 57 | plugins: '../data/plugins/' |
58 | # Overridable client files : logo.svg, favicon.png and icons/*.png (PWA) in client/dist/assets/images | 58 | # Overridable client files in client/dist/assets/images : |
59 | # - logo.svg | ||
60 | # - favicon.png | ||
61 | # - default-playlist.jpg | ||
62 | # - default-avatar-account.png | ||
63 | # - default-avatar-video-channel.png | ||
64 | # - and icons/*.png (PWA) | ||
59 | # Could contain for example assets/images/favicon.png | 65 | # Could contain for example assets/images/favicon.png |
60 | # If the file exists, peertube will serve it | 66 | # If the file exists, peertube will serve it |
61 | # If not, peertube will fallback to the default fil | 67 | # If not, peertube will fallback to the default fil |
diff --git a/support/nginx/peertube b/support/nginx/peertube index 3ef62367c..2b1600d97 100644 --- a/support/nginx/peertube +++ b/support/nginx/peertube | |||
@@ -172,7 +172,7 @@ server { | |||
172 | 172 | ||
173 | # Bypass PeerTube for performance reasons. Optional. | 173 | # Bypass PeerTube for performance reasons. Optional. |
174 | # Should be consistent with client-overrides assets list in /server/controllers/client.ts | 174 | # Should be consistent with client-overrides assets list in /server/controllers/client.ts |
175 | location ~ ^/client/(assets/images/(icons/icon-36x36\.png|icons/icon-48x48\.png|icons/icon-72x72\.png|icons/icon-96x96\.png|icons/icon-144x144\.png|icons/icon-192x192\.png|icons/icon-512x512\.png|logo\.svg|favicon\.png))$ { | 175 | location ~ ^/client/(assets/images/(icons/icon-36x36\.png|icons/icon-48x48\.png|icons/icon-72x72\.png|icons/icon-96x96\.png|icons/icon-144x144\.png|icons/icon-192x192\.png|icons/icon-512x512\.png|logo\.svg|favicon\.png|default-playlist\.jpg|default-avatar-account\.png|default-avatar-video-channel\.png))$ { |
176 | add_header Cache-Control "public, max-age=31536000, immutable"; # Cache 1 year | 176 | add_header Cache-Control "public, max-age=31536000, immutable"; # Cache 1 year |
177 | 177 | ||
178 | root /var/www/peertube; | 178 | root /var/www/peertube; |