Merge branch 'nginx-1-10-2-update' into 'master'

Update NGINX to 1.10.2

This fixes some http/2 protocol issues.
See: https://nginx.org/en/CHANGES-1.10 for more details

Fixes: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1689

Relates to gemnasium work mentioned in: https://gitlab.com/gitlab-org/gitlab-ce/issues/23599

See merge request !1082
This commit is contained in:
Marin Jankovski 2016-11-07 09:43:49 +00:00
commit 085bf61099
2 changed files with 11 additions and 3 deletions

View File

@ -7,6 +7,7 @@ omnibus-gitlab repository.
- Switch the redis user's shell to /bin/false
- NGINX listen on IPv6 by default (George Gooden)
- Upgrade Nginx to 1.10.2
- Update Redis to 3.2.5 (Takuya Noguchi)
- Updarted cacerts.pem to 2016-11-02 version

View File

@ -17,7 +17,7 @@
#
name "nginx"
default_version "1.10.1"
default_version "1.10.2"
license "BSD-2-Clause"
license_file "LICENSE"
@ -25,8 +25,15 @@ license_file "LICENSE"
dependency "pcre"
dependency "openssl"
source url: "http://nginx.org/download/nginx-#{version}.tar.gz",
md5: "088292d9caf6059ef328aa7dda332e44"
version "1.10.1" do
source md5: "088292d9caf6059ef328aa7dda332e44"
end
version "1.10.2" do
source md5: "e8f5f4beed041e63eb97f9f4f55f3085"
end
source url: "http://nginx.org/download/nginx-#{version}.tar.gz"
relative_path "nginx-#{version}"