diff --git a/.gitmodules b/.gitmodules index ad477c24f7..dea0dda602 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "omnibus"] path = omnibus url = https://github.com/chef/chef-server-omnibus-config.git - branch = poorndm/update-omnibus-private + branch = CHEF-29962-CHEF-32135-CHEF-32178/lbaker diff --git a/omnibus b/omnibus index 55093cc90a..a5149f05fa 160000 --- a/omnibus +++ b/omnibus @@ -1 +1 @@ -Subproject commit 55093cc90a3814ef182da43cd4f9539729e3e244 +Subproject commit a5149f05fa2476c0a1b27f13d72387b74270d7c5 diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index fb6d94c0e5..65598e531d 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -15,7 +15,7 @@ override :logrotate, version: "3.19.0" # update `src/openresty-noroot/habitat/plan.sh` when updating this version. -override :openresty, version: "1.27.1.2" +#override :openresty, version: "1.27.1.2" override :nokogiri, version: "1.18.9" -override :openssl, version: "3.2.4", fips_version: "3.1.2", fips_enabled: true +override :openssl, fips_version: "3.1.2", fips_enabled: true diff --git a/src/openresty-noroot/habitat/plan.sh b/src/openresty-noroot/habitat/plan.sh index 0a62a310c9..2b59c5ea8a 100644 --- a/src/openresty-noroot/habitat/plan.sh +++ b/src/openresty-noroot/habitat/plan.sh @@ -1,6 +1,6 @@ pkg_name=openresty-noroot pkg_origin=chef -pkg_version=1.27.1.1 +pkg_version=1.29.2.3 pkg_description="Scalable Web Platform by Extending NGINX with Lua" pkg_maintainer="The Chef Server Maintainers " pkg_license=('BSD-2-Clause') @@ -8,7 +8,7 @@ pkg_source=https://openresty.org/download/openresty-${pkg_version}.tar.gz pkg_dirname=openresty-${pkg_version} pkg_filename=openresty-${pkg_version}.tar.gz pkg_upstream_url=http://openresty.org/ -pkg_shasum=79b071e27bdc143d5f401d0dbf504de4420070d867538c5edc2546d0351fd5c0 +pkg_shasum=315e49fa4568747fec4bdada9614d2ba287e7aed4b3430d7ea25685e24cc43ff pkg_deps=( core/bzip2 core/coreutils