aboutsummaryrefslogtreecommitdiffhomepage
path: root/config
diff options
context:
space:
mode:
authorKim <1877318+kimsible@users.noreply.github.com>2020-07-10 10:20:11 +0200
committerGitHub <noreply@github.com>2020-07-10 10:20:11 +0200
commitcaf2aaf4f9d38ad441a5562c3b8720f8779d6f78 (patch)
tree2a93cbfd2aee6089fd334f28dcb47c18a368a6fd /config
parent27647da17fe53ff24ed27ef8618bc244c0be6b26 (diff)
downloadPeerTube-caf2aaf4f9d38ad441a5562c3b8720f8779d6f78.tar.gz
PeerTube-caf2aaf4f9d38ad441a5562c3b8720f8779d6f78.tar.zst
PeerTube-caf2aaf4f9d38ad441a5562c3b8720f8779d6f78.zip
Add ability to override client assets : logo - favicon - PWA icons - PWA manifest name and description (#2897)
* Add client-overrides storage to config * Add static-serve for client overrides * Move backgroun-image logo from bundle to css tag for runtime content hash * Add dynamic JSON manifest * Add content hash for manifest, favicon and logo Co-authored-by: kimsible <kimsible@users.noreply.github.com>
Diffstat (limited to 'config')
-rw-r--r--config/default.yaml5
-rw-r--r--config/production.yaml.example5
-rw-r--r--config/test-1.yaml1
-rw-r--r--config/test-2.yaml1
-rw-r--r--config/test-3.yaml1
-rw-r--r--config/test-4.yaml1
-rw-r--r--config/test-5.yaml1
-rw-r--r--config/test-6.yaml1
8 files changed, 16 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml
index a3df1bd45..d6f7f7afe 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -85,6 +85,11 @@ storage:
85 captions: 'storage/captions/' 85 captions: 'storage/captions/'
86 cache: 'storage/cache/' 86 cache: 'storage/cache/'
87 plugins: 'storage/plugins/' 87 plugins: 'storage/plugins/'
88 # Overridable client files : logo.svg, favicon.png and icons/*.png (PWA) in client/dist/assets/images
89 # Could contain for example assets/images/favicon.png
90 # If the file exists, peertube will serve it
91 # If not, peertube will fallback to the default fil
92 client_overrides: 'storage/client-overrides/'
88 93
89log: 94log:
90 level: 'info' # debug/info/warning/error 95 level: 'info' # debug/info/warning/error
diff --git a/config/production.yaml.example b/config/production.yaml.example
index a494bdb03..f57861eca 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -86,6 +86,11 @@ storage:
86 captions: '/var/www/peertube/storage/captions/' 86 captions: '/var/www/peertube/storage/captions/'
87 cache: '/var/www/peertube/storage/cache/' 87 cache: '/var/www/peertube/storage/cache/'
88 plugins: '/var/www/peertube/storage/plugins/' 88 plugins: '/var/www/peertube/storage/plugins/'
89 # Overridable client files : logo.svg, favicon.png and icons/*.png (PWA) in client/dist/assets/images
90 # Could contain for example assets/images/favicon.png
91 # If the file exists, peertube will serve it
92 # If not, peertube will fallback to the default fil
93 client_overrides: '/var/www/peertube/storage/client-overrides/'
89 94
90log: 95log:
91 level: 'info' # debug/info/warning/error 96 level: 'info' # debug/info/warning/error
diff --git a/config/test-1.yaml b/config/test-1.yaml
index 7b25f5cf3..2ef9e6c7c 100644
--- a/config/test-1.yaml
+++ b/config/test-1.yaml
@@ -22,6 +22,7 @@ storage:
22 captions: 'test1/captions/' 22 captions: 'test1/captions/'
23 cache: 'test1/cache/' 23 cache: 'test1/cache/'
24 plugins: 'test1/plugins/' 24 plugins: 'test1/plugins/'
25 client_overrides: 'test1/client-overrides/'
25 26
26admin: 27admin:
27 email: 'admin1@example.com' 28 email: 'admin1@example.com'
diff --git a/config/test-2.yaml b/config/test-2.yaml
index 82d4aa35f..b559769c3 100644
--- a/config/test-2.yaml
+++ b/config/test-2.yaml
@@ -22,6 +22,7 @@ storage:
22 captions: 'test2/captions/' 22 captions: 'test2/captions/'
23 cache: 'test2/cache/' 23 cache: 'test2/cache/'
24 plugins: 'test2/plugins/' 24 plugins: 'test2/plugins/'
25 client_overrides: 'test2/client-overrides/'
25 26
26admin: 27admin:
27 email: 'admin2@example.com' 28 email: 'admin2@example.com'
diff --git a/config/test-3.yaml b/config/test-3.yaml
index d2734f469..9a7a944e9 100644
--- a/config/test-3.yaml
+++ b/config/test-3.yaml
@@ -22,6 +22,7 @@ storage:
22 captions: 'test3/captions/' 22 captions: 'test3/captions/'
23 cache: 'test3/cache/' 23 cache: 'test3/cache/'
24 plugins: 'test3/plugins/' 24 plugins: 'test3/plugins/'
25 client_overrides: 'test3/client-overrides/'
25 26
26admin: 27admin:
27 email: 'admin3@example.com' 28 email: 'admin3@example.com'
diff --git a/config/test-4.yaml b/config/test-4.yaml
index 9ec45b024..1e4bee974 100644
--- a/config/test-4.yaml
+++ b/config/test-4.yaml
@@ -22,6 +22,7 @@ storage:
22 captions: 'test4/captions/' 22 captions: 'test4/captions/'
23 cache: 'test4/cache/' 23 cache: 'test4/cache/'
24 plugins: 'test4/plugins/' 24 plugins: 'test4/plugins/'
25 client_overrides: 'test4/client-overrides/'
25 26
26admin: 27admin:
27 email: 'admin4@example.com' 28 email: 'admin4@example.com'
diff --git a/config/test-5.yaml b/config/test-5.yaml
index 92cc113b9..9725e84f4 100644
--- a/config/test-5.yaml
+++ b/config/test-5.yaml
@@ -22,6 +22,7 @@ storage:
22 captions: 'test5/captions/' 22 captions: 'test5/captions/'
23 cache: 'test5/cache/' 23 cache: 'test5/cache/'
24 plugins: 'test5/plugins/' 24 plugins: 'test5/plugins/'
25 client_overrides: 'test5/client-overrides/'
25 26
26admin: 27admin:
27 email: 'admin5@example.com' 28 email: 'admin5@example.com'
diff --git a/config/test-6.yaml b/config/test-6.yaml
index 205d99797..a04c8a6a9 100644
--- a/config/test-6.yaml
+++ b/config/test-6.yaml
@@ -22,6 +22,7 @@ storage:
22 captions: 'test6/captions/' 22 captions: 'test6/captions/'
23 cache: 'test6/cache/' 23 cache: 'test6/cache/'
24 plugins: 'test6/plugins/' 24 plugins: 'test6/plugins/'
25 client_overrides: 'test6/client-overrides/'
25 26
26admin: 27admin:
27 email: 'admin6@example.com' 28 email: 'admin6@example.com'