Skip to content

Commit b91abd7

Browse files
johanneswuerbachjohanneswuerbach
committed
fix(router): gzip content types syntax fixed
gzip content types are only whitespace separated fixed missing table on http://docs.deis.io/en/latest/managing_deis/router_settings/
1 parent df468df commit b91abd7

2 files changed

Lines changed: 26 additions & 26 deletions

File tree

‎docs/managing_deis/router_settings.rst‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -30,31 +30,31 @@ Settings used by router
3030
---------------------------
3131
The following etcd keys are used by the router component.
3232

33-
==================================== =============================================================================================================================================================================================
34-
setting description
35-
==================================== =============================================================================================================================================================================================
36-
/deis/domains/* domain configuration for applications (set by controller)
37-
/deis/services/* application configuration (set by application unit files)
38-
/deis/builder/host host of the builder component (set by builder)
39-
/deis/builder/port port of the builder component (set by builder)
40-
/deis/controller/host host of the controller component (set by controller)
41-
/deis/controller/port port of the controller component (set by controller)
42-
/deis/router/bodySize nginx body size setting (default: 1m)
43-
/deis/router/builder/timeout/connect proxy_connect_timeout for deis-builder (default: 10000). Unit in miliseconds
44-
/deis/router/builder/timeout/read proxy_read_timeout for deis-builder (default: 1200000). Unit in miliseconds
45-
/deis/router/builder/timeout/send proxy_send_timeout for deis-builder (default: 1200000). Unit in miliseconds
46-
/deis/router/builder/timeout/tcp timeout for deis-builder (default: 1200000). Unit in miliseconds
47-
/deis/router/controller/timeout/connect proxy_connect_timeout for deis-controller (default: 10m)
48-
/deis/router/controller/timeout/read proxy_read_timeout for deis-controller (default: 20m)
49-
/deis/router/controller/timeout/send proxy_send_timeout for deis-controller (default: 20m)
50-
/deis/router/gzip nginx gzip setting (default: on)
51-
/deis/router/gzipHttpVersion nginx gzipHttpVersion setting (default: 1.0)
52-
/deis/router/gzipCompLevel nginx gzipCompLevel setting (default: 2)
53-
/deis/router/gzipProxied nginx gzipProxied setting (default: any)
54-
/deis/router/gzipVary nginx gzipVary setting (default: on)
55-
/deis/router/gzipDisable nginx gzipDisable setting (default: "msie6")
56-
/deis/router/gzipTypes nginx gzipTypes setting (default: "application/x-javascript, application/xhtml+xml, application/xml, application/xml+rss, application/json, text/css, text/javascript, text/plain, text/xml")
57-
==================================== =============================================================================================================================================================================================
33+
======================================= =============================================================================================================================================================================================
34+
setting description
35+
======================================= =============================================================================================================================================================================================
36+
/deis/domains/* domain configuration for applications (set by controller)
37+
/deis/services/* application configuration (set by application unit files)
38+
/deis/builder/host host of the builder component (set by builder)
39+
/deis/builder/port port of the builder component (set by builder)
40+
/deis/controller/host host of the controller component (set by controller)
41+
/deis/controller/port port of the controller component (set by controller)
42+
/deis/router/bodySize nginx body size setting (default: 1m)
43+
/deis/router/builder/timeout/connect proxy_connect_timeout for deis-builder (default: 10000). Unit in miliseconds
44+
/deis/router/builder/timeout/read proxy_read_timeout for deis-builder (default: 1200000). Unit in miliseconds
45+
/deis/router/builder/timeout/send proxy_send_timeout for deis-builder (default: 1200000). Unit in miliseconds
46+
/deis/router/builder/timeout/tcp timeout for deis-builder (default: 1200000). Unit in miliseconds
47+
/deis/router/controller/timeout/connect proxy_connect_timeout for deis-controller (default: 10m)
48+
/deis/router/controller/timeout/read proxy_read_timeout for deis-controller (default: 20m)
49+
/deis/router/controller/timeout/send proxy_send_timeout for deis-controller (default: 20m)
50+
/deis/router/gzip nginx gzip setting (default: on)
51+
/deis/router/gzipHttpVersion nginx gzipHttpVersion setting (default: 1.0)
52+
/deis/router/gzipCompLevel nginx gzipCompLevel setting (default: 2)
53+
/deis/router/gzipProxied nginx gzipProxied setting (default: any)
54+
/deis/router/gzipVary nginx gzipVary setting (default: on)
55+
/deis/router/gzipDisable nginx gzipDisable setting (default: "msie6")
56+
/deis/router/gzipTypes nginx gzipTypes setting (default: "application/x-javascript application/xhtml+xml application/xml application/xml+rss application/json text/css text/javascript text/plain text/xml")
57+
======================================= =============================================================================================================================================================================================
5858

5959
Using a custom router image
6060
---------------------------

‎router/bin/boot‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ etcd_set_default gzipCompLevel 2
4343
etcd_set_default gzipProxied any
4444
etcd_set_default gzipVary on
4545
etcd_set_default gzipDisable "\"msie6\""
46-
etcd_set_default gzipTypes "application/x-javascript, application/xhtml+xml, application/xml, application/xml+rss, application/json, text/css, text/javascript, text/plain, text/xml"
46+
etcd_set_default gzipTypes "application/x-javascript application/xhtml+xml application/xml application/xml+rss application/json text/css text/javascript text/plain text/xml"
4747

4848
# wait for confd to run once and install initial templates
4949
until confd -onetime -node $ETCD -config-file /app/confd.toml >/dev/null 2>/dev/null; do

0 commit comments

Comments
 (0)