Merge branch 'nginx_update' into 'master'

Nginx 1.9.10 with http2

Fixes #920



See merge request !629

CHANGELOG.md

@@ -10,6 +10,8 @@ omnibus-gitlab repository.
 - Restart mailroom service when a config changes f77dcfe9949ba6a425c448aff34fdb9cbe289164
 - Remove gitlab-ci standalone from the build, not all gitlab-ci code de6419c850d0302a230b172c06d9e542845bc5b7
 - Switch openssl to 1.0.2f a53d77674f32de055e7f6b4128e25ff7c801a284
+- Update nginx to 1.9.10
+- Use http2 module
 
 8.4.4
 

config/software/nginx.rb

@@ -17,13 +17,13 @@
 #
 
 name "nginx"
-default_version "1.7.12"
+default_version "1.9.10"
 
 dependency "pcre"
 dependency "openssl"
 
 source url: "http://nginx.org/download/nginx-#{version}.tar.gz",
-       md5: "9120b06539e7acb25712a9c5e4711d22"
+       md5: "64cc970988356a5e0fc4fcd1ab84fe57"
 
 relative_path "nginx-#{version}"
 
@@ -33,7 +33,7 @@ build do
            "--with-http_ssl_module",
            "--with-http_stub_status_module",
            "--with-http_gzip_static_module",
-           "--with-http_spdy_module",
+           "--with-http_v2_module",
            "--with-ipv6",
            "--with-debug",
            "--with-ld-opt=-L#{install_dir}/embedded/lib",

files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb

@@ -50,7 +50,7 @@ server {
 
 server {
 <% @listen_addresses.each do |listen_address| %>
-  listen <%= listen_address %>:<%= @listen_port %><% if @https %> ssl spdy<% end %>;
+  listen <%= listen_address %>:<%= @listen_port %><% if @https %> ssl http2<% end %>;
 
   <% if @kerberos_enabled && @kerberos_use_dedicated_port %>
   listen <%= listen_address %>:<%= @kerberos_port %><% if @kerberos_https %> ssl<% end %>;