From ef2cb6948941ce8951d1f3a1ca298b8e9c0c1166 Mon Sep 17 00:00:00 2001 From: Hans Rakers Date: Mon, 14 Oct 2019 14:46:05 +0200 Subject: [PATCH 1/6] Upgrade to OpenResty 1.15.8.2 --- attributes/default.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index e2ac0a1..deadf60 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -21,9 +21,9 @@ # # Download data -default['openresty']['source']['version'] = '1.13.6.2' +default['openresty']['source']['version'] = '1.15.8.2' default['openresty']['source']['file_prefix'] = 'openresty' -default['openresty']['source']['checksum'] = '946e1958273032db43833982e2cec0766154a9b5cb8e67868944113208ff2942' +default['openresty']['source']['checksum'] = '436b4e84d547a97a18cf7a2522daf819da8087b188468946b5a89c0dd1ca5d16' #use %{} for delayed interpolation default['openresty']['source']['name'] = "%{file_prefix}-%{version}" default['openresty']['source']['url'] = "https://openresty.org/download/%{name}.tar.gz" From ff5c1a8d211896247ca21e9a042659d4a3dad073 Mon Sep 17 00:00:00 2001 From: Hans Rakers Date: Mon, 14 Oct 2019 14:46:23 +0200 Subject: [PATCH 2/6] Upgrade to PCRE 8.43 --- attributes/custom_pcre.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/attributes/custom_pcre.rb b/attributes/custom_pcre.rb index 4229e73..ef89a29 100644 --- a/attributes/custom_pcre.rb +++ b/attributes/custom_pcre.rb @@ -20,6 +20,6 @@ # limitations under the License. # -default['openresty']['pcre']['version'] = '8.41' +default['openresty']['pcre']['version'] = '8.43' default['openresty']['pcre']['url'] = "https://sourceforge.net/projects/pcre/files/pcre/#{node['openresty']['pcre']['version']}/pcre-#{node['openresty']['pcre']['version']}.tar.bz2/download" -default['openresty']['pcre']['checksum'] = 'e62c7eac5ae7c0e7286db61ff82912e1c0b7a0c13706616e94a7dd729321b530' +default['openresty']['pcre']['checksum'] = '91e762520003013834ac1adb4a938d53b22a216341c061b0cf05603b290faf6b' From 28a78132f6196319e86a50c7eb1edbc91162345a Mon Sep 17 00:00:00 2001 From: Hans Rakers Date: Mon, 14 Oct 2019 14:46:54 +0200 Subject: [PATCH 3/6] Upgrade to luarocks 3.2.1 --- attributes/luarocks.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/attributes/luarocks.rb b/attributes/luarocks.rb index e159f03..a412623 100644 --- a/attributes/luarocks.rb +++ b/attributes/luarocks.rb @@ -19,7 +19,7 @@ # limitations under the License. # -default['openresty']['luarocks']['version'] = '2.4.2' +default['openresty']['luarocks']['version'] = '3.2.1' default['openresty']['luarocks']['url'] = "http://luarocks.org/releases/luarocks-#{node['openresty']['luarocks']['version']}.tar.gz" -default['openresty']['luarocks']['checksum'] = '0e1ec34583e1b265e0fbafb64c8bd348705ad403fe85967fd05d3a659f74d2e5' +default['openresty']['luarocks']['checksum'] = 'f27e20c9cdb3ffb991ccdb85796c36a0690566676f8e1a59b0d0ee6598907d04' default['openresty']['luarocks']['default_rocks'] = Hash.new From a3e11f9971ce8e28f7831ed8dfd92ee9ae1b9010 Mon Sep 17 00:00:00 2001 From: Hans Rakers Date: Mon, 14 Oct 2019 14:47:20 +0200 Subject: [PATCH 4/6] Update symlink to luajit binary for new version --- attributes/or_modules.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attributes/or_modules.rb b/attributes/or_modules.rb index 973102b..7536ae9 100644 --- a/attributes/or_modules.rb +++ b/attributes/or_modules.rb @@ -22,7 +22,7 @@ # LUAJIT Module default['openresty']['or_modules']['luajit'] = true -default['openresty']['or_modules']['luajit_binary'] = '2.1.0-beta1' +default['openresty']['or_modules']['luajit_binary'] = '2.1.0-beta3' # Iconv Module default['openresty']['or_modules']['iconv'] = true # Drizzle module From 3190b6c0a1ef5e26dee51efe555e3653ec0c9589 Mon Sep 17 00:00:00 2001 From: Hans Rakers Date: Mon, 14 Oct 2019 14:48:04 +0200 Subject: [PATCH 5/6] Fix Berksfile supermarket source, pin seven_zip < 3.0.0 for chef-client 12 --- Berksfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Berksfile b/Berksfile index c4bb297..d651222 100644 --- a/Berksfile +++ b/Berksfile @@ -1,3 +1,5 @@ -site :opscode +source 'https://supermarket.chef.io' metadata + +cookbook 'seven_zip', '< 3.0.0' From 2fd2942b500750b95b37c892e4241d8c3f6fa436 Mon Sep 17 00:00:00 2001 From: Hans Rakers Date: Mon, 14 Oct 2019 14:48:23 +0200 Subject: [PATCH 6/6] Accept chef license --- .kitchen.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.kitchen.yml b/.kitchen.yml index 6caa442..e091caa 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -5,6 +5,7 @@ driver: provisioner: name: chef_solo log_level: info + chef_license: accept platforms: - name: ubuntu-16.04-chef-12