Merge pull request #3591 from aledbf/update-nginx-1.9

feat(router): nginx 1.9.0. Remove third party tcp module

Author: aledbf

docs/customizing_deis/router_settings.rst

@@ -41,9 +41,7 @@ setting                                      description
 /deis/router/bodySize                        nginx body size setting (default: 1m)
 /deis/router/defaultTimeout                  default timeout value in seconds. Should be greater then the frontfacing load balancers timeout value (default: 1300)
 /deis/router/builder/timeout/connect         proxy_connect_timeout for deis-builder (default: 10000). Unit in miliseconds
-/deis/router/builder/timeout/read            proxy_read_timeout for deis-builder (default: 1200000). Unit in miliseconds
-/deis/router/builder/timeout/send            proxy_send_timeout for deis-builder (default: 1200000). Unit in miliseconds
-/deis/router/builder/timeout/tcp             timeout for deis-builder (default: 1200000). Unit in miliseconds
+/deis/router/builder/timeout/tcp             proxy_timeout for deis-builder (default: 1200000). Unit in miliseconds
 /deis/router/controller/timeout/connect      proxy_connect_timeout for deis-controller (default: 10m)
 /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)

router/build.sh

@@ -10,8 +10,7 @@ if [[ -z $DOCKER_BUILD ]]; then
   exit 1
 fi
 
-export VERSION_NGINX=nginx-1.8.0
-export VERSION_TCP_PROXY=f2156eff9f6621aaf601eaa8dee40c6820dea0b0
+export VERSION_NGINX=nginx-1.9.0
 export VERSION_NAXSI=0d53a64ed856e694fcb4038748c8cf6d5551a603
 
 export BUILD_PATH=/tmp/build
@@ -32,19 +31,15 @@ apt-get update \
 
 # grab the source files
 curl -sSL http://nginx.org/download/$VERSION_NGINX.tar.gz -o $BUILD_PATH/$VERSION_NGINX.tar.gz
-curl -sSL https://github.com/yaoweibin/nginx_tcp_proxy_module/archive/$VERSION_TCP_PROXY.tar.gz -o $BUILD_PATH/$VERSION_TCP_PROXY.tar.gz
 curl -sSL https://github.com/nbs-system/naxsi/archive/$VERSION_NAXSI.tar.gz -o $BUILD_PATH/$VERSION_NAXSI.tar.gz
 
 # expand the source files
 tar xzf $VERSION_NGINX.tar.gz
-tar xzf $VERSION_TCP_PROXY.tar.gz
 tar xzf $VERSION_NAXSI.tar.gz
 
 # build nginx
 cd $BUILD_PATH/$VERSION_NGINX
 
-patch -p1 < $BUILD_PATH/nginx_tcp_proxy_module-$VERSION_TCP_PROXY/tcp.patch
-
 ./configure \
   --prefix=$PREFIX \
   --pid-path=/run/nginx.pid \
@@ -63,7 +58,7 @@ patch -p1 < $BUILD_PATH/nginx_tcp_proxy_module-$VERSION_TCP_PROXY/tcp.patch
   --with-http_sub_module \
   --with-mail \
   --with-mail_ssl_module \
-  --add-module=$BUILD_PATH/nginx_tcp_proxy_module-$VERSION_TCP_PROXY \
+  --with-stream \
   --add-module=$BUILD_PATH/naxsi-$VERSION_NAXSI/naxsi_src \
   && make && make install
 

router/image/templates/nginx.conf

@@ -292,22 +292,15 @@ http {
 
 ## start builder
 {{ if .deis_builder_host }}
-tcp {
-    access_log /opt/nginx/logs/git.log;
-    tcp_nodelay on;
-    timeout {{ or (.deis_router_builder_timeout_tcp) "1200000" }};
-
-    # same directive names, but these are in miliseconds...
-    proxy_connect_timeout       {{ or (.deis_router_builder_timeout_connect) "10000" }};
-    proxy_send_timeout          {{ or (.deis_router_builder_timeout_send) "1200000" }};
-    proxy_read_timeout          {{ or (.deis_router_builder_timeout_read) "1200000" }};
-
+stream {
     upstream builder {
         server {{ .deis_builder_host }}:{{ .deis_builder_port }};
     }
 
     server {
         listen 2222;
+        proxy_connect_timeout  {{ or (.deis_router_builder_timeout_connect) "10000" }};
+        proxy_timeout          {{ or (.deis_router_builder_timeout_tcp) "1200000" }};
         proxy_pass builder;
     }
 }{{ end }}