aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/shared/shared-main/video-channel/video-channel.model.ts2
-rw-r--r--client/src/assets/images/default-avatar-video-channel.png (renamed from client/src/assets/images/default-avatar-videochannel.png)bin4024 -> 4024 bytes
-rw-r--r--config/default.yaml8
-rw-r--r--config/production.yaml.example8
-rw-r--r--server/controllers/client.ts5
-rw-r--r--support/docker/production/config/production.yaml8
-rw-r--r--support/nginx/peertube2
7 files changed, 27 insertions, 6 deletions
diff --git a/client/src/app/shared/shared-main/video-channel/video-channel.model.ts b/client/src/app/shared/shared-main/video-channel/video-channel.model.ts
index 66d4cac68..ac2679b42 100644
--- a/client/src/app/shared/shared-main/video-channel/video-channel.model.ts
+++ b/client/src/app/shared/shared-main/video-channel/video-channel.model.ts
@@ -41,7 +41,7 @@ export class VideoChannel extends Actor implements ServerVideoChannel {
41 } 41 }
42 42
43 static GET_DEFAULT_AVATAR_URL () { 43 static GET_DEFAULT_AVATAR_URL () {
44 return `${window.location.origin}/client/assets/images/default-avatar-videochannel.png` 44 return `${window.location.origin}/client/assets/images/default-avatar-video-channel.png`
45 } 45 }
46 46
47 constructor (hash: Partial<ServerVideoChannel>) { 47 constructor (hash: Partial<ServerVideoChannel>) {
diff --git a/client/src/assets/images/default-avatar-videochannel.png b/client/src/assets/images/default-avatar-video-channel.png
index e24741815..e24741815 100644
--- a/client/src/assets/images/default-avatar-videochannel.png
+++ b/client/src/assets/images/default-avatar-video-channel.png
Binary files differ
diff --git a/config/default.yaml b/config/default.yaml
index eb96b6bbb..707187b7c 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -89,7 +89,13 @@ storage:
89 captions: 'storage/captions/' 89 captions: 'storage/captions/'
90 cache: 'storage/cache/' 90 cache: 'storage/cache/'
91 plugins: 'storage/plugins/' 91 plugins: 'storage/plugins/'
92 # Overridable client files : logo.svg, favicon.png and icons/*.png (PWA) in client/dist/assets/images 92 # Overridable client files in client/dist/assets/images :
93 # - logo.svg
94 # - favicon.png
95 # - default-playlist.jpg
96 # - default-avatar-account.png
97 # - default-avatar-video-channel.png
98 # - and icons/*.png (PWA)
93 # Could contain for example assets/images/favicon.png 99 # Could contain for example assets/images/favicon.png
94 # If the file exists, peertube will serve it 100 # If the file exists, peertube will serve it
95 # If not, peertube will fallback to the default fil 101 # If not, peertube will fallback to the default fil
diff --git a/config/production.yaml.example b/config/production.yaml.example
index 082c75e53..e405daa71 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -87,7 +87,13 @@ storage:
87 captions: '/var/www/peertube/storage/captions/' 87 captions: '/var/www/peertube/storage/captions/'
88 cache: '/var/www/peertube/storage/cache/' 88 cache: '/var/www/peertube/storage/cache/'
89 plugins: '/var/www/peertube/storage/plugins/' 89 plugins: '/var/www/peertube/storage/plugins/'
90 # Overridable client files : logo.svg, favicon.png and icons/*.png (PWA) in client/dist/assets/images 90 # Overridable client files in client/dist/assets/images :
91 # - logo.svg
92 # - favicon.png
93 # - default-playlist.jpg
94 # - default-avatar-account.png
95 # - default-avatar-video-channel.png
96 # - and icons/*.png (PWA)
91 # Could contain for example assets/images/favicon.png 97 # Could contain for example assets/images/favicon.png
92 # If the file exists, peertube will serve it 98 # If the file exists, peertube will serve it
93 # If not, peertube will fallback to the default file 99 # If not, peertube will fallback to the default file
diff --git a/server/controllers/client.ts b/server/controllers/client.ts
index cdc556da2..86ac5fbbc 100644
--- a/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@ -65,7 +65,10 @@ const staticClientOverrides = [
65 'assets/images/icons/icon-96x96.png', 65 'assets/images/icons/icon-96x96.png',
66 'assets/images/icons/icon-144x144.png', 66 'assets/images/icons/icon-144x144.png',
67 'assets/images/icons/icon-192x192.png', 67 'assets/images/icons/icon-192x192.png',
68 'assets/images/icons/icon-512x512.png' 68 'assets/images/icons/icon-512x512.png',
69 'assets/images/default-playlist.jpg',
70 'assets/images/default-avatar-account.png',
71 'assets/images/default-avatar-video-channel.png'
69] 72]
70 73
71for (const staticClientOverride of staticClientOverrides) { 74for (const staticClientOverride of staticClientOverrides) {
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;