Merge pull request #2040 from johanneswuerbach/patch-6

fix(router): Use official javascript content type

Author: Gabriel Monroy

docs/managing_deis/router_settings.rst

@@ -30,9 +30,9 @@ Settings used by router
 ---------------------------
 The following etcd keys are used by the router component.
 
-=======================================      =============================================================================================================================================================================================
+=======================================      ==================================================================================================================================================================================================================================================================================================================================
 setting                                      description
-=======================================      =============================================================================================================================================================================================
+=======================================      ==================================================================================================================================================================================================================================================================================================================================
 /deis/domains/*                              domain configuration for applications (set by controller)
 /deis/services/*                             application configuration (set by application unit files)
 /deis/builder/host                           host of the builder component (set by builder)
@@ -48,13 +48,14 @@ setting                                      description
 /deis/router/controller/timeout/read         proxy_read_timeout for deis-controller (default: 20m)
 /deis/router/controller/timeout/send         proxy_send_timeout for deis-controller (default: 20m)
 /deis/router/gzip                            nginx gzip setting (default: on)
-/deis/router/gzipHttpVersion                 nginx gzipHttpVersion setting (default: 1.0)
-/deis/router/gzipCompLevel                   nginx gzipCompLevel setting (default: 2)
+/deis/router/gzipHttpVersion                 nginx gzipHttpVersion setting (default: 1.1)
+/deis/router/gzipCompLevel                   nginx gzipCompLevel setting (default: 5)
 /deis/router/gzipProxied                     nginx gzipProxied setting (default: any)
 /deis/router/gzipVary                        nginx gzipVary setting (default: on)
 /deis/router/gzipDisable                     nginx gzipDisable setting (default: "msie6")
-/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")
-=======================================      =============================================================================================================================================================================================
+/deis/router/gzipTypes                       nginx gzipTypes setting (default: "application/atom+xml application/javascript application/json application/rss+xml application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/svg+xml image/x-icon text/css text/plain text/x-component")
+/deis/router/gzipMinLength                   nginx gzipMinLength setting (default: 256)
+=======================================      ==================================================================================================================================================================================================================================================================================================================================
 
 Using a custom router image
 ---------------------------

router/bin/boot

@@ -38,12 +38,13 @@ etcd_safe_mkdir /deis/services
 etcd_safe_mkdir /deis/domains
 etcd_safe_mkdir /deis/builder
 etcd_set_default gzip on
-etcd_set_default gzipHttpVersion 1.0
-etcd_set_default gzipCompLevel 2
+etcd_set_default gzipHttpVersion 1.1
+etcd_set_default gzipCompLevel 5
+etcd_set_default gzipMinLength 256
 etcd_set_default gzipProxied any
 etcd_set_default gzipVary on
 etcd_set_default gzipDisable "\"msie6\""
-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"
+etcd_set_default gzipTypes "application/atom+xml application/javascript application/json application/rss+xml application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/svg+xml image/x-icon text/css text/plain text/x-component"
 
 # spawn the service in the background
 echo "Starting Nginx..."

router/templates/nginx.conf

@@ -2,7 +2,7 @@
 daemon off;
 
 user www-data;
-worker_processes 4;
+worker_processes auto;
 pid /run/nginx.pid;
 
 events {
@@ -26,10 +26,11 @@ http {
     gzip_comp_level {{ .deis_router_gzipCompLevel }};
     gzip_disable {{ .deis_router_gzipDisable }};
     gzip_http_version {{ .deis_router_gzipHttpVersion }};
+    gzip_min_length {{ .deis_router_gzipMinLength }};
     gzip_types {{ .deis_router_gzipTypes }};
     gzip_proxied {{ .deis_router_gzipProxied }};
     gzip_vary {{ .deis_router_gzipVary }};{{ end }}
-    
+
     client_max_body_size {{ or (.deis_router_bodySize) "1m" }};
 
     # send logs to STDOUT so they can be seen using 'docker logs'